Fix ordering in cvs calls to be correct, thanks to exg for the fix (again)
authorAlec Warner <antarus@gentoo.org>
Mon, 3 Apr 2006 13:40:56 +0000 (13:40 -0000)
committerAlec Warner <antarus@gentoo.org>
Mon, 3 Apr 2006 13:40:56 +0000 (13:40 -0000)
svn path=/main/trunk/; revision=3066

bin/repoman

index f72996e157a959f490c3769977caf25dd96444a1..bd0e0655b6dab187b4560035feeb59d5d7674b62 100755 (executable)
@@ -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):