summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-11-28 05:49:27 +0000
committerZac Medico <zmedico@gentoo.org>2007-11-28 05:49:27 +0000
commitc8e9acee36bde7f1044466d40546cd748701a2a4 (patch)
tree9498948cdce8b99fe7e2c3f8612096242fb5e504
parente79ecc67fb16d72ceb93e516c5430d426323dd79 (diff)
downloadportage-c8e9acee36bde7f1044466d40546cd748701a2a4.tar.gz
portage-c8e9acee36bde7f1044466d40546cd748701a2a4.tar.bz2
portage-c8e9acee36bde7f1044466d40546cd748701a2a4.zip
Disable PORTAGE_PACKAGE_EMPTY_ABORT by default since
the scrollkeeper-9999 upgrade will trigger a false positive. Thanks to leio for reporting. svn path=/main/trunk/; revision=8724
-rw-r--r--pym/portage/dbapi/vartree.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index 29019a53b..5bca2f8e2 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -1788,7 +1788,7 @@ class dblink(object):
# If there are no files to merge, and an installed package in the same
# slot has files, it probably means that something went wrong.
- if self.settings.get("PORTAGE_PACKAGE_EMPTY_ABORT") != "0" and \
+ if self.settings.get("PORTAGE_PACKAGE_EMPTY_ABORT") == "1" and \
not myfilelist and not mylinklist and others_in_slot:
installed_files = None
for other_dblink in others_in_slot: