From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 22 Aug 2013 02:19:19 +0000 (-0700)
Subject: repoman: fix manifest for --echangelog
X-Git-Tag: v2.2.1~5
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=94aed24784d5122c5bbd7afd6dd85ee83c10ab2e;p=portage.git

repoman: fix manifest for --echangelog
---

diff --git a/bin/repoman b/bin/repoman
index 31ae74755..5250af04e 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -2719,6 +2719,7 @@ else:
 
 	commitmessage += commit_footer
 
+	broken_changelog_manifests = []
 	if options.echangelog in ('y', 'force'):
 		logging.info("checking for unmodified ChangeLog files")
 		committer_name = utilities.get_committer_name(env=repoman_settings)
@@ -2774,6 +2775,8 @@ else:
 				# regenerate Manifest for modified ChangeLog (bug #420735)
 				repoman_settings["O"] = checkdir
 				digestgen(mysettings=repoman_settings, myportdb=portdb)
+			else:
+				broken_changelog_manifests.append(x)
 
 	if myautoadd:
 		print(">>> Auto-Adding missing Manifest/ChangeLog file(s)...")
@@ -3003,6 +3006,11 @@ else:
 			repoman_settings["O"] = os.path.join(repodir, x)
 			digestgen(mysettings=repoman_settings, myportdb=portdb)
 
+	elif broken_changelog_manifests:
+		for x in broken_changelog_manifests:
+			repoman_settings["O"] = os.path.join(repodir, x)
+			digestgen(mysettings=repoman_settings, myportdb=portdb)
+
 	signed = False
 	if sign_manifests:
 		signed = True