From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 24 May 2007 05:49:44 +0000 (-0000)
Subject: Make PackageIndex.write() omit USE when appropriate.
X-Git-Tag: v2.2_pre1~1375
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=bf8e88f8e7ec66a476eb0e2bf9eeca763a7546e1;p=portage.git

Make PackageIndex.write() omit USE when appropriate.

svn path=/main/trunk/; revision=6613
---

diff --git a/pym/portage/getbinpkg.py b/pym/portage/getbinpkg.py
index 47413259b..76016e3c0 100644
--- a/pym/portage/getbinpkg.py
+++ b/pym/portage/getbinpkg.py
@@ -619,10 +619,11 @@ class PackageIndex(object):
 		keys.sort()
 		writepkgindex(pkgfile, [(k, self.header[k]) for k in keys])
 		for cpv in cpv_all:
-			metadata = self.packages[cpv]
-			if metadata["SLOT"] == "0":
-				metadata = metadata.copy()
+			metadata = self.packages[cpv].copy()
+			if metadata.get("SLOT") == "0":
 				del metadata["SLOT"]
+			if metadata.get("USE") == "":
+				del metadata["USE"]
 			keys = metadata.keys()
 			keys.sort()
 			writepkgindex(pkgfile, [(k, metadata[k]) for k in keys])