repoman: later --ask prompt for bug #395995
authorZac Medico <zmedico@gentoo.org>
Sun, 25 Dec 2011 20:05:08 +0000 (12:05 -0800)
committerZac Medico <zmedico@gentoo.org>
Sun, 25 Dec 2011 20:05:08 +0000 (12:05 -0800)
bin/repoman

index 5924ba9ef25ab25ca122402c6cfd15e5ebc8e5d0..5fc2de00bc591938907173065450fd48816431a0 100755 (executable)
@@ -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.