s/series/serious/ mistake

svn path=/main/trunk/; revision=2347

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 50fc32a38b2e9383846f140d35f998ddba5e0b53..4bf4363ced0e861e53e7e3e0fac34be39bec878c 100755 (executable)
--- 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 1b3e495ea7e49ccaab02f40a11014f0d9f3adb53..2a6867909301b569dfb82240c6edfcf29793de65 100644 (file)
--- 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.