diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rwxr-xr-x | bin/env-update.sh | 4 | ||||
| -rw-r--r-- | pym/portage.py | 10 | ||||
| -rw-r--r-- | pym/portage_const.py | 5 |
4 files changed, 12 insertions, 13 deletions
@@ -1,12 +1,16 @@ # ChangeLog for Portage; the Gentoo Linux ports system # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Id: ChangeLog,v 1.956 2005/04/26 09:40:59 genone Exp $ +# $Id: ChangeLog,v 1.957 2005/04/29 04:43:19 vapier Exp $ MAJOR CHANGES in 2.0.51: 1. /var/cache/edb/virtuals is no longer used at all. It's calculated now. 2. /var/cache/edb/world is now /var/lib/portage/world. 3. /etc/portage/profile/virtuals is _USER_ configs only. + 29 Apr 2005; Mike Frysinger <vapier@gentoo.org> bin/env-update.sh + pym/portage.py pym/portage_const.py: + Remove execution of depscan.sh #86523. + 26 Apr 2005; Marius Mauch <genone@gentoo.org> cnf/make.globals*: Add FEATURES=strict. diff --git a/bin/env-update.sh b/bin/env-update.sh index a7b8691..2d09252 100755 --- a/bin/env-update.sh +++ b/bin/env-update.sh @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-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/bin/env-update.sh,v 1.2 2004/10/04 13:56:50 vapier Exp $ +# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/env-update.sh,v 1.3 2005/04/29 04:43:19 vapier Exp $ ############################################ ############################################ @@ -217,5 +217,3 @@ cat << EOF > ${CSHENV} $(set | grep '^my_envd_' | sed -e 's:^my_envd_\([[:alpha:]_][[:alnum:]_]*\)=:setenv \1 :') EOF - -[[ ${ROOT} == / ]] && /sbin/depscan.sh 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" |