diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2005-04-29 04:43:19 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2005-04-29 04:43:19 +0000 |
| commit | 4489c0df7a4d58b6049aa8496a161e482cceaf63 (patch) | |
| tree | 51229b283dcc0a7cc9fe029be0ee4de54d7873d7 /pym | |
| parent | stupid typo (diff) | |
| download | portage-cvs-4489c0df7a4d58b6049aa8496a161e482cceaf63.tar.gz portage-cvs-4489c0df7a4d58b6049aa8496a161e482cceaf63.tar.bz2 portage-cvs-4489c0df7a4d58b6049aa8496a161e482cceaf63.zip | |
dont run depscan.sh anymore #86523
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage.py | 10 | ||||
| -rw-r--r-- | pym/portage_const.py | 5 |
2 files changed, 6 insertions, 9 deletions
diff --git a/pym/portage.py b/pym/portage.py index ebdb3f1..8cc4982 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -2,10 +2,10 @@ # portage.py -- core Portage functionality # 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/pym/portage.py,v 1.588 2005/04/25 04:10:37 genone Exp $ -cvs_id_string="$Id: portage.py,v 1.588 2005/04/25 04:10:37 genone Exp $"[5:-2] +# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/pym/portage.py,v 1.589 2005/04/29 04:43:19 vapier Exp $ +cvs_id_string="$Id: portage.py,v 1.589 2005/04/29 04:43:19 vapier Exp $"[5:-2] -VERSION="$Revision: 1.588 $"[11:-2] + "-cvs" +VERSION="$Revision: 1.589 $"[11:-2] + "-cvs" # =========================================================================== # START OF IMPORTS -- START OF IMPORTS -- START OF IMPORTS -- START OF IMPORT @@ -87,7 +87,7 @@ try: from portage_const import VDB_PATH, PRIVATE_PATH, CACHE_PATH, DEPCACHE_PATH, \ USER_CONFIG_PATH, MODULES_FILE_PATH, CUSTOM_PROFILE_PATH, PORTAGE_BASE_PATH, \ PORTAGE_BIN_PATH, PORTAGE_PYM_PATH, PROFILE_PATH, LOCALE_DATA_PATH, \ - EBUILD_SH_BINARY, SANDBOX_BINARY, DEPSCAN_SH_BINARY, BASH_BINARY, \ + EBUILD_SH_BINARY, SANDBOX_BINARY, BASH_BINARY, \ MOVE_BINARY, PRELINK_BINARY, WORLD_FILE, MAKE_CONF_FILE, MAKE_DEFAULTS_FILE, \ DEPRECATED_PROFILE_FILE, USER_VIRTUALS_FILE, EBUILD_SH_ENV_FILE, \ INVALID_ENV_FILE, CUSTOM_MIRRORS_FILE, SANDBOX_PIDS_FILE, CONFIG_MEMORY_FILE,\ @@ -482,8 +482,6 @@ def env_update(root,makelinks=1): continue outfile.write("setenv "+x+" '"+env[x]+"'\n") outfile.close() - if os.path.exists(DEPSCAN_SH_BINARY): - spawn(DEPSCAN_SH_BINARY,settings,free=1) def new_protect_filename(mydest, newmd5=None): """Resolves a config-protect filename for merging, optionally diff --git a/pym/portage_const.py b/pym/portage_const.py index b935c92..dbe0111 100644 --- a/pym/portage_const.py +++ b/pym/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/pym/portage_const.py,v 1.9 2005/03/22 19:29:57 genone Exp $ -cvs_id_string="$Id: portage_const.py,v 1.9 2005/03/22 19:29:57 genone Exp $"[5:-2] +# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/pym/portage_const.py,v 1.10 2005/04/29 04:43:19 vapier Exp $ +cvs_id_string="$Id: portage_const.py,v 1.10 2005/04/29 04:43:19 vapier Exp $"[5:-2] # =========================================================================== # START OF CONSTANTS -- START OF CONSTANTS -- START OF CONSTANTS -- START OF @@ -33,7 +33,6 @@ if not os.path.exists(SANDBOX_BINARY): if os.path.exists(PORTAGE_BIN_PATH+"/sandbox"): SANDBOX_BINARY=PORTAGE_BIN_PATH+"/sandbox" -DEPSCAN_SH_BINARY = "/sbin/depscan.sh" BASH_BINARY = "/bin/bash" MOVE_BINARY = "/bin/mv" PRELINK_BINARY = "/usr/sbin/prelink" |