From 65a67cf601c8a0e2496c64ce5f0a8a9888fb1dcf Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Sat, 10 Mar 2007 20:07:46 +0000 Subject: [PATCH] Merged from trunk 620{0,3} Add back a missing `source isolated-functions.sh`. The color logic is handled internally. import portage.xpak to avoid deprecation warning For bug #170178, remove all hardcoded references to '/usr/lib/portage'. svn path=/main/branches/prefix/; revision=6204 --- bin/emerge-webrsync | 7 ++++--- bin/etc-update | 7 +++---- bin/misc-functions.sh | 2 +- bin/quickpkg | 5 +---- pym/portage/dbapi/vartree.py | 7 ++++--- pym/portage/locks.py | 3 ++- 6 files changed, 15 insertions(+), 16 deletions(-) diff --git a/bin/emerge-webrsync b/bin/emerge-webrsync index c0be976cd..91ffa0392 100755 --- a/bin/emerge-webrsync +++ b/bin/emerge-webrsync @@ -5,8 +5,9 @@ # Author: Karl Trygve Kalleberg # Rewritten from the old, Perl-based emerge-webrsync script -eval $("@PORTAGE_BASE@"/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 EPREFIX) DISTDIR="${PORTAGE_TMPDIR}/emerge-webrsync" @@ -16,7 +17,7 @@ if [ -n "${PORTAGE_NICENESS}" ]; then renice $PORTAGE_NICENESS $$ > /dev/null fi -source "@PORTAGE_BASE@"/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 61a427d57..1bd35a151 100755 --- a/bin/etc-update +++ b/bin/etc-update @@ -439,10 +439,9 @@ scriptname=$(basename $0) trap die term - -eval $(@PORTAGE_BASE@/bin/portageq envvar -v CONFIG_PROTECT \ - CONFIG_PROTECT_MASK PORTAGE_CONFIGROOT PORTAGE_TMPDIR ROOT \ - USERLAND EPREFIX) +type portageq > /dev/null || exit $? +eval $(portageq envvar -v CONFIG_PROTECT \ + CONFIG_PROTECT_MASK PORTAGE_CONFIGROOT PORTAGE_TMPDIR ROOT USERLAND EPREFIX) export PORTAGE_TMPDIR export EROOT=${ROOT%/}${EPREFIX}/ diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh index 6ac0f72b6..f7b1c8021 100644 --- a/bin/misc-functions.sh +++ b/bin/misc-functions.sh @@ -559,7 +559,7 @@ dyn_package() { die "Failed to create tarball" cd .. export PYTHONPATH=${PORTAGE_PYM_PATH:-${EPREFIX}/usr/lib/portage/pym} - python -c "import portage.xpak; t=portage.xpak.tbz2('${pkg_tmp}'); t.recompose('${PORTAGE_BUILDDIR}/build-info')" + python -c "from portage import xpak; t=xpak.tbz2('${pkg_tmp}'); t.recompose('${PORTAGE_BUILDDIR}/build-info')" if [ $? -ne 0 ]; then rm -f "${pkg_tmp}" die "Failed to append metadata to the tbz2 file" diff --git a/bin/quickpkg b/bin/quickpkg index 3524c6565..a422ef1e7 100755 --- a/bin/quickpkg +++ b/bin/quickpkg @@ -83,10 +83,7 @@ while [[ -n $1 ]] ; do done [[ ${SET_X} == "yes" ]] && set -x -case ${NOCOLOR:-false} in - yes|true) unset_colors;; - no|false) set_colors;; -esac +source "${PORTAGE_BIN_PATH}/isolated-functions.sh" # here we make a package given a little info # $1 = package-name w/version diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index e1c946276..e28938027 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, EPREFIX +from portage.const import CACHE_PATH, CONFIG_MEMORY_FILE, PORTAGE_BIN_PATH, \ + PRIVATE_PATH, VDB_PATH, EPREFIX 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 1647d2058..836b8306a 100644 --- a/pym/portage/locks.py +++ b/pym/portage/locks.py @@ -232,10 +232,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 "%s/bin/clean_locks can fix stuck locks." % portage.const.PORTAGE_BASE + print "%s/clean_locks can fix stuck locks." % PORTAGE_BIN_PATH print "Lockfile: " + lockfilename time.sleep(3) -- 2.26.2