From dfa7289014b7a015f42c4cfc304904488bbc50b1 Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 28 Aug 2007 03:15:34 +0000
Subject: Make the commit message indicate when the --force option is used.

svn path=/main/trunk/; revision=7712
---
 bin/repoman | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'bin')

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()
-- 
cgit v1.2.3-1-g7c22