From: Alec Warner <antarus@gentoo.org>
Date: Mon, 3 Apr 2006 13:40:56 +0000 (-0000)
Subject: Fix ordering in cvs calls to be correct, thanks to exg for the fix (again)
X-Git-Tag: v2.1_pre8~34
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3c22641ed1f098db8e0f9c7e7828d0c66b42b253;p=portage.git

Fix ordering in cvs calls to be correct, thanks to exg for the fix (again)

svn path=/main/trunk/; revision=3066
---

diff --git a/bin/repoman b/bin/repoman
index f72996e15..bd0e0655b 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -1567,14 +1567,14 @@ else:
 		print green("------------------------------------------------------------------------------")
 		print
 
+		retval = None
 		if "--pretend" in myoptions:
-			print "(/usr/bin/cvs -q commit "+string.join(myupdates," ")+" -F "+commitmessagefile+")"
-			retval=0
+			print "(/usr/bin/cvs -q commit -F "+ commitmessagefile +" "+ string.join(myupdates," ")"+")"
 		else:
-			retval=os.system("/usr/bin/cvs -q commit "+string.join(myupdates, " ")+" -F "+commitmessagefile)
-		if retval:
-			print "!!! Exiting on cvs (shell) error code:",retval
-			sys.exit(retval)
+			retval=os.system("/usr/bin/cvs -q commit -F "+ commitmessagefile + " " +string.join(myupdates, " "))
+			if retval:
+				print "!!! Exiting on cvs (shell) error code:",retval
+				sys.exit(retval)
 
 	# Setup the GPG commands
 	def gpgsign(filename):