| 1 |
commit: 656562dd40ea1487dd93a565f8f2f87040555b42 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Dec 25 20:05:08 2011 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Dec 25 20:05:08 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=656562dd |
| 7 |
|
| 8 |
repoman: later --ask prompt for bug #395995 |
| 9 |
|
| 10 |
--- |
| 11 |
bin/repoman | 8 ++++---- |
| 12 |
1 files changed, 4 insertions(+), 4 deletions(-) |
| 13 |
|
| 14 |
diff --git a/bin/repoman b/bin/repoman |
| 15 |
index 5924ba9..5fc2de0 100755 |
| 16 |
--- a/bin/repoman |
| 17 |
+++ b/bin/repoman |
| 18 |
@@ -2443,10 +2443,6 @@ else: |
| 19 |
commitmessage += ", RepoMan options: --force" |
| 20 |
commitmessage += ")" |
| 21 |
|
| 22 |
- if options.ask and userquery('Commit changes?', True) != 'Yes': |
| 23 |
- print("* aborting commit.") |
| 24 |
- sys.exit(1) |
| 25 |
- |
| 26 |
if options.echangelog in ('y', 'force'): |
| 27 |
logging.info("checking for unmodified ChangeLog files") |
| 28 |
committer_name = utilities.get_committer_name(env=repoman_settings) |
| 29 |
@@ -2570,6 +2566,10 @@ else: |
| 30 |
logging.info("myupdates: %s", myupdates) |
| 31 |
logging.info("myheaders: %s", myheaders) |
| 32 |
|
| 33 |
+ if options.ask and userquery('Commit changes?', True) != 'Yes': |
| 34 |
+ print("* aborting commit.") |
| 35 |
+ sys.exit(1) |
| 36 |
+ |
| 37 |
# Handle the case where committed files have keywords which |
| 38 |
# will change and need a priming commit before the Manifest |
| 39 |
# can be committed. |
Archives