From a00ff78df7156bf000b9ac91da5d35cce66b563b Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Thu, 6 Sep 2007 17:45:59 +0000 Subject: Make the commit message indicate when the --force option is used. (trunk r7712) svn path=/main/branches/2.1.2/; revision=7738 --- bin/repoman | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'bin/repoman') 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() -- cgit v1.2.3-1-g7c22