rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

made find revision method compatible with python 2.3

This commit is contained in:
Nick Bolton 2011-01-23 23:03:28 +00:00
parent 3b3d292f0f
commit 443647a2b1
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
build/toolchain.py
View File

@ -404,11 +404,15 @@ class InternalCommands:
print self.find_revision()
def find_revision(self):
p = subprocess.Popen(['svn', 'info'], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
stdout, stderr = p.communicate()
if sys.version_info < (2, 4):
import commands
stdout = commands.getoutput('svn info')
else:
p = subprocess.Popen(['svn', 'info'], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
stdout, stderr = p.communicate()
if p.returncode != 0:
raise Exception('Could not get revision - svn info failed with code: ' + str(p.returncode))
if p.returncode != 0:
raise Exception('Could not get revision - svn info failed with code: ' + str(p.returncode))
m = re.search('.*Revision: (\d+).*', stdout)
if not m:
@ -622,7 +626,7 @@ class InternalCommands:
elif type == 'mac':
#ext = 'dmg'
ext = 'zip'
platform = self.macPackageName
platform = self.getMacPackageName()
if not platform:
raise Exception('Unable to detect package platform.')