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

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index 29019a53b7e71907183d51e492580da9e84c5ec2..5bca2f8e200332dab256fd23c180b0d802d3f4d2 100644 (file)
--- 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: