fix up spacing, remove commented out code, fix copyright (sort of see-if-I-can-commit...

svn path=/main/trunk/; revision=13824

diff --git a/pym/portage/const.py b/pym/portage/const.py
index 1b838e62f7f7553ff2d518fdb52355bb366b9715..6e202bfa95a377486c9be38266fcf22476332e53 100644 (file)
--- a/pym/portage/const.py
+++ b/pym/portage/const.py
@@ -1,5 +1,5 @@
 # portage: Constants
-# Copyright 1998-2004 Gentoo Foundation
+# Copyright 1998-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -10,66 +10,66 @@
 
 import os
 
-VDB_PATH                = "var/db/pkg"
-PRIVATE_PATH            = "var/lib/portage"
-CACHE_PATH              = "/var/cache/edb"
-DEPCACHE_PATH           = CACHE_PATH+"/dep"
+VDB_PATH                 = "var/db/pkg"
+PRIVATE_PATH             = "var/lib/portage"
+CACHE_PATH               = "/var/cache/edb"
+DEPCACHE_PATH            = CACHE_PATH+"/dep"
 
-USER_CONFIG_PATH        = "etc/portage"
-MODULES_FILE_PATH       = USER_CONFIG_PATH+"/modules"
-CUSTOM_PROFILE_PATH     = USER_CONFIG_PATH+"/profile"
-GLOBAL_CONFIG_PATH      = "/usr/share/portage/config"
+USER_CONFIG_PATH         = "etc/portage"
+MODULES_FILE_PATH        = USER_CONFIG_PATH+"/modules"
+CUSTOM_PROFILE_PATH      = USER_CONFIG_PATH+"/profile"
+GLOBAL_CONFIG_PATH       = "/usr/share/portage/config"
 
-#PORTAGE_BASE_PATH       = "/usr/lib/portage"
-PORTAGE_BASE_PATH       = os.path.join(os.sep, os.sep.join(__file__.split(os.sep)[:-3]))
-PORTAGE_BIN_PATH        = PORTAGE_BASE_PATH+"/bin"
-PORTAGE_PYM_PATH        = PORTAGE_BASE_PATH+"/pym"
-PORTAGE_PACKAGE_ATOM    = "sys-apps/portage"
-NEWS_LIB_PATH           = "/var/lib/gentoo"
-PROFILE_PATH            = "etc/make.profile"
-LOCALE_DATA_PATH        = PORTAGE_BASE_PATH+"/locale"
+PORTAGE_BASE_PATH        = os.path.join(os.sep, os.sep.join(__file__.split(os.sep)[:-3]))
+PORTAGE_BIN_PATH         = PORTAGE_BASE_PATH+"/bin"
+PORTAGE_PYM_PATH         = PORTAGE_BASE_PATH+"/pym"
+PORTAGE_PACKAGE_ATOM     = "sys-apps/portage"
+NEWS_LIB_PATH            = "/var/lib/gentoo"
+PROFILE_PATH             = "etc/make.profile"
+LOCALE_DATA_PATH         = PORTAGE_BASE_PATH+"/locale"
 
-EBUILD_SH_BINARY        = PORTAGE_BIN_PATH+"/ebuild.sh"
-MISC_SH_BINARY          = PORTAGE_BIN_PATH + "/misc-functions.sh"
-SANDBOX_BINARY          = "/usr/bin/sandbox"
-FAKEROOT_BINARY         = "/usr/bin/fakeroot"
-BASH_BINARY             = "/bin/bash"
-MOVE_BINARY             = "/bin/mv"
-PRELINK_BINARY          = "/usr/sbin/prelink"
+EBUILD_SH_BINARY         = PORTAGE_BIN_PATH+"/ebuild.sh"
+MISC_SH_BINARY           = PORTAGE_BIN_PATH + "/misc-functions.sh"
+SANDBOX_BINARY           = "/usr/bin/sandbox"
+FAKEROOT_BINARY          = "/usr/bin/fakeroot"
+BASH_BINARY              = "/bin/bash"
+MOVE_BINARY              = "/bin/mv"
+PRELINK_BINARY           = "/usr/sbin/prelink"
 
-WORLD_FILE              = PRIVATE_PATH + "/world"
-MAKE_CONF_FILE          = "etc/make.conf"
-MAKE_DEFAULTS_FILE      = PROFILE_PATH + "/make.defaults"
-DEPRECATED_PROFILE_FILE = PROFILE_PATH+"/deprecated"
-USER_VIRTUALS_FILE      = USER_CONFIG_PATH+"/virtuals"
-EBUILD_SH_ENV_FILE      = USER_CONFIG_PATH+"/bashrc"
-INVALID_ENV_FILE        = "/etc/spork/is/not/valid/profile.env"
-CUSTOM_MIRRORS_FILE     = USER_CONFIG_PATH+"/mirrors"
-CONFIG_MEMORY_FILE      = PRIVATE_PATH + "/config"
-COLOR_MAP_FILE          = USER_CONFIG_PATH + "/color.map"
+WORLD_FILE               = PRIVATE_PATH + "/world"
+MAKE_CONF_FILE           = "etc/make.conf"
+MAKE_DEFAULTS_FILE       = PROFILE_PATH + "/make.defaults"
+DEPRECATED_PROFILE_FILE  = PROFILE_PATH+"/deprecated"
+USER_VIRTUALS_FILE       = USER_CONFIG_PATH+"/virtuals"
+EBUILD_SH_ENV_FILE       = USER_CONFIG_PATH+"/bashrc"
+INVALID_ENV_FILE         = "/etc/spork/is/not/valid/profile.env"
+CUSTOM_MIRRORS_FILE      = USER_CONFIG_PATH+"/mirrors"
+CONFIG_MEMORY_FILE       = PRIVATE_PATH + "/config"
+COLOR_MAP_FILE           = USER_CONFIG_PATH + "/color.map"
 
-REPO_NAME_FILE         = "repo_name"
-REPO_NAME_LOC          = "profiles" + "/" + REPO_NAME_FILE
+REPO_NAME_FILE           = "repo_name"
+REPO_NAME_LOC            = "profiles" + "/" + REPO_NAME_FILE
 
-INCREMENTALS = ["USE", "USE_EXPAND", "USE_EXPAND_HIDDEN", "FEATURES",
-       "ACCEPT_KEYWORDS",
-       "CONFIG_PROTECT_MASK", "CONFIG_PROTECT",
-       "PRELINK_PATH", "PRELINK_PATH_MASK", "PROFILE_ONLY_VARIABLES"]
-EBUILD_PHASES           = ["setup", "unpack", "prepare", "configure",
-                          "compile", "test", "install",
-                          "package", "preinst", "postinst","prerm", "postrm",
-                          "nofetch", "config", "info", "other"]
+INCREMENTALS             = ["USE", "USE_EXPAND", "USE_EXPAND_HIDDEN",
+                           "FEATURES", "ACCEPT_KEYWORDS",
+                           "CONFIG_PROTECT_MASK", "CONFIG_PROTECT",
+                           "PRELINK_PATH", "PRELINK_PATH_MASK",
+                           "PROFILE_ONLY_VARIABLES"]
+EBUILD_PHASES            = ["setup", "unpack", "prepare", "configure",
+                           "compile", "test", "install",
+                           "package", "preinst", "postinst","prerm", "postrm",
+                           "nofetch", "config", "info", "other"]
 
-EAPI = 2
+EAPI                     = 2
 
 HASHING_BLOCKSIZE        = 32768
 MANIFEST1_HASH_FUNCTIONS = ["MD5","SHA256","RMD160"]
 MANIFEST2_HASH_FUNCTIONS = ["SHA1","SHA256","RMD160"]
 
-MANIFEST1_REQUIRED_HASH = "MD5"
-MANIFEST2_REQUIRED_HASH = "SHA1"
+MANIFEST1_REQUIRED_HASH  = "MD5"
+MANIFEST2_REQUIRED_HASH  = "SHA1"
 
-MANIFEST2_IDENTIFIERS = ["AUX","MISC","DIST","EBUILD"]
+MANIFEST2_IDENTIFIERS    = ["AUX","MISC","DIST","EBUILD"]
 # ===========================================================================
 # END OF CONSTANTS -- END OF CONSTANTS -- END OF CONSTANTS -- END OF CONSTANT
 # ===========================================================================