From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 25 Dec 2011 20:05:08 +0000 (-0800)
Subject: repoman: later --ask prompt for bug #395995
X-Git-Tag: v2.2.0_alpha84~2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=656562dd40ea1487dd93a565f8f2f87040555b42;p=portage.git

repoman: later --ask prompt for bug #395995
---

diff --git a/bin/repoman b/bin/repoman
index 5924ba9ef..5fc2de00b 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -2443,10 +2443,6 @@ else:
 		commitmessage += ", RepoMan options: --force"
 	commitmessage += ")"
 
-	if options.ask and userquery('Commit changes?', True) != 'Yes':
-		print("* aborting commit.")
-		sys.exit(1)
-
 	if options.echangelog in ('y', 'force'):
 		logging.info("checking for unmodified ChangeLog files")
 		committer_name = utilities.get_committer_name(env=repoman_settings)
@@ -2570,6 +2566,10 @@ else:
 	logging.info("myupdates: %s", myupdates)
 	logging.info("myheaders: %s", myheaders)
 
+	if options.ask and userquery('Commit changes?', True) != 'Yes':
+		print("* aborting commit.")
+		sys.exit(1)
+
 	# Handle the case where committed files have keywords which
 	# will change and need a priming commit before the Manifest
 	# can be committed.