diff options
author | Brian Harring <ferringb@gentoo.org> | 2005-07-27 02:20:13 +0000 |
---|---|---|
committer | Brian Harring <ferringb@gentoo.org> | 2005-07-27 02:20:13 +0000 |
commit | f9dbc40424cac86f7681ace25f50d723085511fb (patch) | |
tree | 88c9afbcf36681fbe77a3fd5e8e5aa2bc1a16789 | |
parent | cleanup (diff) | |
download | portage-cvs-f9dbc40424cac86f7681ace25f50d723085511fb.tar.gz portage-cvs-f9dbc40424cac86f7681ace25f50d723085511fb.tar.bz2 portage-cvs-f9dbc40424cac86f7681ace25f50d723085511fb.zip |
threw out some unused vars
-rw-r--r-- | portage/const.py | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/portage/const.py b/portage/const.py index 0ce1c4c..0a5bd83 100644 --- a/portage/const.py +++ b/portage/const.py @@ -1,8 +1,8 @@ # portage: Constants # Copyright 1998-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/portage/const.py,v 1.3 2005/07/22 23:27:42 ferringb Exp $ -cvs_id_string="$Id: const.py,v 1.3 2005/07/22 23:27:42 ferringb Exp $"[5:-2] +# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/portage/const.py,v 1.4 2005/07/27 02:20:13 ferringb Exp $ +cvs_id_string="$Id: const.py,v 1.4 2005/07/27 02:20:13 ferringb Exp $"[5:-2] # note this is lifted out of portage 2. so... it's held onto for the sake of having stuff we still need, # but it does need cleanup. @@ -12,16 +12,15 @@ cvs_id_string="$Id: const.py,v 1.3 2005/07/22 23:27:42 ferringb Exp $"[5:-2] PRIVATE_PATH = "/var/lib/portage" USER_CONFIG_PATH = "/etc/portage" -#CUSTOM_PROFILE_PATH = USER_CONFIG_PATH+"/profile" -#PORTAGE_BASE_PATH = "/usr/lib/portage" + try: import portage_custom_path except (ImportError, AttributeError): portage_custom_path = None print "warning, can't find portage_custom_path. which means no custom PORTAGE_BASE_PATH" - print "so... that means you're getting /home/bharring/new/ , which quite likely isn't what you want" + print "so... that means you're getting /usr/lib/portage/ as a base , which quite likely isn't what you want" PORTAGE_BASE_PATH = getattr(portage_custom_path, "PORTAGE_BASE_PATH", "/usr/lib/portage/") PORTAGE_BIN_PATH = getattr(portage_custom_path, "PORTAGE_BIN_PATH", PORTAGE_BASE_PATH+"/bin") @@ -51,19 +50,10 @@ 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" SANDBOX_PIDS_FILE = "/tmp/sandboxpids.tmp" -# since I didn't know wtf this was, it's used for knowing when CONFIG_PROTECT* can be ignored. -CONFIG_MEMORY_FILE = PRIVATE_PATH + "/config" - -# wtf is this actually used for!? -#STICKIES=["KEYWORDS_ACCEPT","USE","CFLAGS","CXXFLAGS","MAKEOPTS","EXTRA_ECONF","EXTRA_EINSTALL","EXTRA_EMAKE"] - #CONFCACHE_FILE = CACHE_PATH+"/confcache" #CONFCACHE_LIST = CACHE_PATH+"/confcache_files.anydbm" @@ -75,6 +65,3 @@ RSYNC_HOST = "rsync.gentoo.org/gentoo-portage" CVS_BIN = "/usr/bin/cvs" -# find a better place for this... -EBUILD_PHASES = "setup unpack compile test install preinst postinst prerm postrm" - |