From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 6 Apr 2006 02:06:10 +0000 (-0000)
Subject: Revert r3073 since it causes a regression (digestgen needs to be run for each value... 
X-Git-Tag: v2.1_pre8~22
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=640a1e5d86289d34641454120f87f6c477e34fea;p=portage.git

Revert r3073 since it causes a regression (digestgen needs to be run for each value of repoman_settings["O"]).  See bug #128946.

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

diff --git a/bin/repoman b/bin/repoman
index 3c45c6381..7068ccdd9 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -1601,6 +1601,7 @@ else:
 		mydone=[]
 		if repolevel==3:   # In a package dir
 			repoman_settings["O"]=os.getcwd()
+			portage.digestgen([],repoman_settings,manifestonly=1)
 		elif repolevel==2: # In a category dir
 			for x in myfiles:
 				xs=string.split(x,"/")
@@ -1610,6 +1611,7 @@ else:
 					continue
 				mydone.append(xs[0])
 				repoman_settings["O"]=os.path.join(os.getcwd(), xs[0])
+				portage.digestgen([],repoman_settings,manifestonly=1)
 		elif repolevel==1: # repo-cvsroot
 			print green("RepoMan sez:"), "\"You're rather crazy... doing the entire repository.\"\n"
 			for x in myfiles:
@@ -1620,6 +1622,7 @@ else:
 					continue
 				mydone.append(string.join(xs[:2],"/"))
 				repoman_settings["O"]=os.path.join(os.getcwd(), x[0], x[1])
+				portage.digestgen([],repoman_settings,manifestonly=1)
 		else:
 			print red("I'm confused... I don't know where I am!")
 			sys.exit(1)
@@ -1627,7 +1630,6 @@ else:
 		if "--pretend" in myoptions:
 			print "(/usr/bin/cvs -q commit -F "+commitmessagefile+")"
 		else:
-			portage.digestgen([],repoman_settings,manifestonly=1)
 			mymsg=open(commitmessagefile,"w")
 			mymsg.write(commitmessage)
 			mymsg.write(" (Unsigned Manifest commit)")