From ff0dfb0b1072c1d0e14fdcbf58581941baea7bb6 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Tue, 27 Mar 2007 20:32:16 +0000 Subject: For bug #170178, remove all hardcoded references to '/usr/lib/portage'. (trunk r6202:6203) svn path=/main/branches/2.1.2/; revision=6293 --- pym/portage.py | 4 ++-- pym/portage_locks.py | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'pym') diff --git a/pym/portage.py b/pym/portage.py index bfe9060da..7c9f995cb 100644 --- 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 389adddde..8358b3063 100644 --- 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) -- cgit v1.2.3-1-g7c22