diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-03-10 00:08:13 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-03-10 00:08:13 +0000 |
| commit | 4722f5ae2ecbd194ecc34c6365f64b2d6614295a (patch) | |
| tree | a6ab7c1a68b74507a8532c423bb95f2353ebfc0a | |
| parent | 3f97da4a44583dc747043f0b973adca167051ba4 (diff) | |
| download | portage-4722f5ae2ecbd194ecc34c6365f64b2d6614295a.tar.gz portage-4722f5ae2ecbd194ecc34c6365f64b2d6614295a.tar.bz2 portage-4722f5ae2ecbd194ecc34c6365f64b2d6614295a.zip | |
For bug #170178, remove all hardcoded references to '/usr/lib/portage'.
svn path=/main/trunk/; revision=6203
| -rwxr-xr-x | bin/emerge-webrsync | 7 | ||||
| -rwxr-xr-x | bin/etc-update | 4 | ||||
| -rw-r--r-- | pym/portage/dbapi/vartree.py | 7 | ||||
| -rw-r--r-- | pym/portage/locks.py | 3 |
4 files changed, 12 insertions, 9 deletions
diff --git a/bin/emerge-webrsync b/bin/emerge-webrsync index 24fc377c2..7602deab5 100755 --- a/bin/emerge-webrsync +++ b/bin/emerge-webrsync @@ -5,8 +5,9 @@ # Author: Karl Trygve Kalleberg <karltk@gentoo.org> # Rewritten from the old, Perl-based emerge-webrsync script -eval $(/usr/lib/portage/bin/portageq envvar -v FEATURES FETCHCOMMAND \ - GENTOO_MIRRORS PORTAGE_INST_UID PORTAGE_INST_GID PORTAGE_NICENESS \ +type portageq > /dev/null || exit $? +eval $(portageq envvar -v FEATURES FETCHCOMMAND GENTOO_MIRRORS \ + PORTAGE_BIN_PATH PORTAGE_INST_UID PORTAGE_INST_GID PORTAGE_NICENESS \ PORTAGE_TMPDIR PORTDIR PORTAGE_RSYNC_EXTRA_OPTS) DISTDIR="${PORTAGE_TMPDIR}/emerge-webrsync" @@ -16,7 +17,7 @@ if [ -n "${PORTAGE_NICENESS}" ]; then renice $PORTAGE_NICENESS $$ > /dev/null fi -source /usr/lib/portage/bin/isolated-functions.sh || exit 1 +source "${PORTAGE_BIN_PATH}"/isolated-functions.sh || exit 1 if [ ! -d $DISTDIR ] ; then mkdir -p $DISTDIR diff --git a/bin/etc-update b/bin/etc-update index c1569ff12..ab376b83c 100755 --- a/bin/etc-update +++ b/bin/etc-update @@ -439,8 +439,8 @@ scriptname=$(basename $0) trap die term - -eval $(/usr/lib/portage/bin/portageq envvar -v CONFIG_PROTECT \ +type portageq > /dev/null || exit $? +eval $(portageq envvar -v CONFIG_PROTECT \ CONFIG_PROTECT_MASK PORTAGE_CONFIGROOT PORTAGE_TMPDIR ROOT USERLAND) export PORTAGE_TMPDIR diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index 59ea9eb4e..a4c7737d5 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -1,5 +1,6 @@ from portage.checksum import perform_md5 -from portage.const import CACHE_PATH, CONFIG_MEMORY_FILE, PRIVATE_PATH, VDB_PATH +from portage.const import CACHE_PATH, CONFIG_MEMORY_FILE, PORTAGE_BIN_PATH, \ + PRIVATE_PATH, VDB_PATH from portage.data import portage_gid, portage_uid, secpass from portage.dbapi import dbapi from portage.dep import dep_getslot, use_reduce, paren_reduce, isvalidatom, \ @@ -98,7 +99,7 @@ class vardbapi(dbapi): except Exception, e: writemsg("!!! COUNTER file is missing for "+str(mycpv)+" in /var/db.\n", noiselevel=-1) - writemsg("!!! Please run /usr/lib/portage/bin/fix-db.py or\n", + writemsg("!!! Please run %s/fix-db.py or\n" % PORTAGE_BIN_PATH, noiselevel=-1) writemsg("!!! unmerge this exact version.\n", noiselevel=-1) writemsg("!!! %s\n" % e, noiselevel=-1) @@ -106,7 +107,7 @@ class vardbapi(dbapi): else: writemsg("!!! COUNTER file is missing for "+str(mycpv)+" in /var/db.\n", noiselevel=-1) - writemsg("!!! Please run /usr/lib/portage/bin/fix-db.py or\n", + writemsg("!!! Please run %s/fix-db.py or\n" % PORTAGE_BIN_PATH, noiselevel=-1) writemsg("!!! remerge the package.\n", noiselevel=-1) sys.exit(1) diff --git a/pym/portage/locks.py b/pym/portage/locks.py index 167109432..2575a978b 100644 --- a/pym/portage/locks.py +++ b/pym/portage/locks.py @@ -231,10 +231,11 @@ def hardlink_lockfile(lockfilename, max_wait=14400): writemsg(".") else: reported_waiting = True + from portage.const import PORTAGE_BIN_PATH print print "Waiting on (hardlink) lockfile: (one '.' per 3 seconds)" print "This is a feature to prevent distfiles corruption." - print "/usr/lib/portage/bin/clean_locks can fix stuck locks." + print "%s/clean_locks can fix stuck locks." % PORTAGE_BIN_PATH print "Lockfile: " + lockfilename time.sleep(3) |