summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2011-12-25 12:05:08 -0800
committerZac Medico <zmedico@gentoo.org>2011-12-25 12:05:08 -0800
commit656562dd40ea1487dd93a565f8f2f87040555b42 (patch)
tree9c0546e837918002f430f39c2464dcb68c9de71a /bin
parent4cfa78b9406d9a8f94b3eae23631b2bb430bc533 (diff)
downloadportage-656562dd40ea1487dd93a565f8f2f87040555b42.tar.gz
portage-656562dd40ea1487dd93a565f8f2f87040555b42.tar.bz2
portage-656562dd40ea1487dd93a565f8f2f87040555b42.zip
repoman: later --ask prompt for bug #395995
Diffstat (limited to 'bin')
-rwxr-xr-xbin/repoman8
1 files changed, 4 insertions, 4 deletions
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.