From: Jason Stubbs Date: Wed, 7 Dec 2005 23:43:07 +0000 (-0000) Subject: s/series/serious/ mistake X-Git-Tag: v2.1_pre1~33 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=cfdab7872b599b4d6c9f455d7c277e593b271767;p=portage.git s/series/serious/ mistake svn path=/main/trunk/; revision=2347 --- diff --git a/bin/ebuild.sh b/bin/ebuild.sh index 50fc32a38..4bf4363ce 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -1107,7 +1107,7 @@ dyn_install() { scanelf -qyRF '%p %n' "${D}" | sed -e 's:^:/:' > "${BUILDDIR}"/build-info/NEEDED if [[ ${qa_sucks_for_sure} -eq 1 ]] ; then - die "Aborting due to series QA concerns" + die "Aborting due to serious QA concerns" elif [[ ${qa_kinda_sucks} -eq 1 ]] && has stricter ${FEATURES} && ! has stricter ${RESTRICT} ; then die "Aborting due to QA concerns" fi diff --git a/pym/portage.py b/pym/portage.py index 1b3e495ea..2a6867909 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -1467,6 +1467,9 @@ class config: self.already_in_regenerate = 0 def getvirtuals(self, myroot): + if self.virtuals: + return self.virtuals + myvirts = {} # This breaks catalyst/portage when setting to a fresh/empty root.