For bug #170178, remove all hardcoded references to '/usr/lib/portage'. (trunk r6202...

svn path=/main/branches/2.1.2/; revision=6293

diff --git a/bin/emerge-webrsync b/bin/emerge-webrsync
index b1362b379b1f08ddb9272514e5feb401b6b8dbb5..36b8e130733f19c619259cb63607f0306b5d39c2 100755 (executable)
--- a/bin/emerge-webrsync
+++ b/bin/emerge-webrsync
@@ -5,7 +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 \
+type portageq > /dev/null || exit $?
+eval $(portageq envvar -v FEATURES FETCHCOMMAND GENTOO_MIRRORS \
+       PORTAGE_BIN_PATH PORTAGE_INST_UID PORTAGE_INST_GID PORTAGE_NICENESS \
        GENTOO_MIRRORS PORTAGE_INST_UID PORTAGE_INST_GID PORTAGE_NICENESS \
        PORTAGE_TMPDIR PORTDIR)
 DISTDIR="${PORTAGE_TMPDIR}/emerge-webrsync"
@@ -16,7 +18,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 c1569ff12150343ba0290879109a89542f7792fc..ab376b83c1a78e9f8514bb32e34205525299808d 100755 (executable)
--- 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.py b/pym/portage.py
index bfe9060dab4af25be1fd0ad15fbb0eab32489fac..7c9f995cb5be348ce4688090dcf9656b48e10db8 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -5001,7 +5001,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)
@@ -5009,7 +5009,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 389addddee222f78b0e82288898fb7e9336ca52a..8358b3063e7213092e81fd99330ea7b1963016b3 100644 (file)
--- a/pym/portage_locks.py
+++ b/pym/portage_locks.py
@@ -235,10 +235,11 @@ def hardlink_lockfile(lockfilename, max_wait=14400):
                        portage_util.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)