mail[Wesnoth-commits] r33258 - /trunk/SConstruct


Others Months | Index by Date | Thread Index
>>   [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Header


Content

Posted by soliton . de on March 01, 2009 - 19:08:
Author: soliton
Date: Sun Mar  1 19:08:26 2009
New Revision: 33258

URL: http://svn.gna.org/viewcvs/wesnoth?rev=33258&view=rev
Log:
use proper git subcommand invocations

Modified:
    trunk/SConstruct

Modified: trunk/SConstruct
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/SConstruct?rev=33258&r1=33257&r2=33258&view=diff
==============================================================================
--- trunk/SConstruct (original)
+++ trunk/SConstruct Sun Mar  1 19:08:26 2009
@@ -340,12 +340,12 @@
 
 if os.path.exists('.git'):
     try:
-        env["svnrev"] = Popen(Split("git-svn find-rev refs/remotes/trunk"), 
stdout=PIPE, stderr=PIPE).communicate()[0].rstrip("\n")
+        env["svnrev"] = Popen(Split("git svn find-rev refs/remotes/trunk"), 
stdout=PIPE, stderr=PIPE).communicate()[0].rstrip("\n")
         if not env["svnrev"]:
-            # If you use git-svn for one svn path only there's no 
refs/remotes/trunk, only git-svn branch
-            env["svnrev"] = Popen(Split("git-svn find-rev git-svn"), 
stdout=PIPE, stderr=PIPE).communicate()[0].rstrip("\n")
-        # if git-svn can't find HEAD it's a local commit
-        if Popen(Split("git-svn find-rev HEAD"), 
stdout=PIPE).communicate()[0].rstrip("\n") == "":
+            # If you use git svn for one svn path only there's no 
refs/remotes/trunk, only git svn branch
+            env["svnrev"] = Popen(Split("git svn find-rev git svn"), 
stdout=PIPE, stderr=PIPE).communicate()[0].rstrip("\n")
+        # if git svn can't find HEAD it's a local commit
+        if Popen(Split("git svn find-rev HEAD"), 
stdout=PIPE).communicate()[0].rstrip("\n") == "":
             env["svnrev"] += "L"
         if Popen(Split("git diff --exit-code --quiet")).wait() == 1:
             env["svnrev"] += "M"




Related Messages


Powered by MHonArc, Updated Sun Mar 01 19:20:05 2009