diff options
author | Zac Medico <zmedico@gentoo.org> | 2007-09-06 17:45:59 +0000 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2007-09-06 17:45:59 +0000 |
commit | a00ff78df7156bf000b9ac91da5d35cce66b563b (patch) | |
tree | 2cc6ea659581ecf613e2e418aeeca6df36352984 | |
parent | 528f07aea2db7071c3eb35f5ca9f7286879405a3 (diff) | |
download | portage-a00ff78df7156bf000b9ac91da5d35cce66b563b.tar.gz portage-a00ff78df7156bf000b9ac91da5d35cce66b563b.tar.bz2 portage-a00ff78df7156bf000b9ac91da5d35cce66b563b.zip |
Make the commit message indicate when the --force option is used. (trunk r7712)
svn path=/main/branches/2.1.2/; revision=7738
-rwxr-xr-x | bin/repoman | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/bin/repoman b/bin/repoman index cd8fca0bc..a31cc6ea8 100755 --- a/bin/repoman +++ b/bin/repoman @@ -1680,12 +1680,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() |