From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 22 Feb 2007 13:09:55 +0000 (-0000)
Subject: Fix broken file list handling for FEATUES=sign when only the Manifest has changed.
X-Git-Tag: v2.2_pre1~1665
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ea4ab01794f3c1faab20966a16af990aaa3c7510;p=portage.git

Fix broken file list handling for FEATUES=sign when only the Manifest has changed.

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

diff --git a/bin/repoman b/bin/repoman
index b599f9111..7006620b0 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -1551,6 +1551,7 @@ else:
 
 	# Manifests need to be regenerated after all other commits, so don't commit
 	# them now even if they have changed.
+	mymanifests = [f for f in mychanged if "Manifest" == os.path.basename(f)]
 	mychanged = [f for f in mychanged if "Manifest" != os.path.basename(f)]
 	myupdates=mychanged+mynew
 	myheaders=[]
@@ -1717,6 +1718,7 @@ else:
 	signed = False
 	if "sign" in repoman_settings.features:
 		signed = True
+		myfiles = myupdates + myremoved + mymanifests
 		try:
 			if repolevel==3:   # In a package dir
 				repoman_settings["O"] = "."
@@ -1725,6 +1727,8 @@ else:
 				mydone=[]
 				for x in myfiles:
 					xs=x.split("/")
+					if len(xs) < 4-repolevel:
+						continue
 					if xs[0]==".":
 						xs=xs[1:]
 					if xs[0] in mydone:
@@ -1737,6 +1741,8 @@ else:
 				mydone=[]
 				for x in myfiles:
 					xs=x.split("/")
+					if len(xs) < 4-repolevel:
+						continue
 					if xs[0]==".":
 						xs=xs[1:]
 					if "/".join(xs[:2]) in mydone: