From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 28 Nov 2007 05:53:11 +0000 (-0000)
Subject: Disable PORTAGE_PACKAGE_EMPTY_ABORT by default since
X-Git-Tag: v2.1.4~182
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=bbafb0cfaee0b223be83c352c1ced58b04f76a9e;p=portage.git

Disable PORTAGE_PACKAGE_EMPTY_ABORT by default since
the scrollkeeper-9999 upgrade will trigger a false
positive. Thanks to leio for reporting. (trunk r8724)

svn path=/main/branches/2.1.2/; revision=8725
---

diff --git a/pym/portage.py b/pym/portage.py
index e4e3dca7e..9e14be1b6 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -8424,7 +8424,7 @@ class dblink:
 
 		# 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 others_in_slot:
 			installed_files = None
 			for other_dblink in others_in_slot: