summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-08-28 03:15:34 +0000
committerZac Medico <zmedico@gentoo.org>2007-08-28 03:15:34 +0000
commitdfa7289014b7a015f42c4cfc304904488bbc50b1 (patch)
treeaf0ef1b2198c6d8d78fd6ada434f9ced865eac8c
parentb57a772ba25645f1687d9799709b882cf5ef9445 (diff)
downloadportage-dfa7289014b7a015f42c4cfc304904488bbc50b1.tar.gz
portage-dfa7289014b7a015f42c4cfc304904488bbc50b1.tar.bz2
portage-dfa7289014b7a015f42c4cfc304904488bbc50b1.zip
Make the commit message indicate when the --force option is used.
svn path=/main/trunk/; revision=7712
-rwxr-xr-xbin/repoman15
1 files changed, 9 insertions, 6 deletions
diff --git a/bin/repoman b/bin/repoman
index e7b76cc68..3c68088b3 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -1710,12 +1710,15 @@ else:
commitmessage=raw_input(green("> "))
except KeyboardInterrupt:
exithandler()
- try:
- commitmessage+="\n(Portage version: "+str(portage.VERSION)+")"
- except AttributeError:
- print "Failed to insert portage version in message!"
- commitmessage+="\n(Portage version: Unknown)"
-
+ portage_version = getattr(portage, "VERSION", None)
+ if portage_version is None:
+ sys.stderr.write("Failed to insert portage version in message!\n")
+ sys.stderr.flush()
+ portage_version = "Unknown"
+ commitmessage += "\n(Portage version: "+str(portage_version)
+ if "--force" in myoptions:
+ commitmessage += ", RepoMan options: --force"
+ commitmessage += ")"
if not manifest1_compat:
myfiles = myupdates + myremoved + mymanifests
filesdirs = set()