From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 29 Jan 2010 18:49:58 +0000 (-0000)
Subject: Fix Manifest commit logic for cvs and svn. Thanks to Rafael Martins
X-Git-Tag: v2.1.7.17~14
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=89163087db88fc5aa43bf5adfbbd9d983729e569;p=portage.git

Fix Manifest commit logic for cvs and svn. Thanks to Rafael Martins
<rafael@rafaelmartins.com>. (trunk r15205)

svn path=/main/branches/2.1.7/; revision=15258
---

diff --git a/bin/repoman b/bin/repoman
index fd3c519a3..442fb83d8 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -2485,12 +2485,12 @@ else:
 		commit_cmd.extend(vcs_global_opts)
 		commit_cmd.append("commit")
 		commit_cmd.extend(vcs_local_opts)
-		if vcs in ('git', 'bzr'):
-			commit_cmd.extend(["-F", commitmessagefile])
-			commit_cmd.extend(f.lstrip("./") for f in myfiles)
-		elif vcs == "hg":
+		if vcs == "hg":
 			commit_cmd.extend(["--logfile", commitmessagefile])
 			commit_cmd.extend(myfiles)
+		else:
+			commit_cmd.extend(["-F", commitmessagefile])
+			commit_cmd.extend(f.lstrip("./") for f in myfiles)
 
 		try:
 			if options.pretend: