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

Merge in 1.3.6 r661:663 into 1.4.2 and trunk

This commit is contained in:
Nick Bolton 2010-06-22 00:09:29 +00:00
parent f7b0e24a6e
commit d88542ec57
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/commands.py
View File

@ -376,11 +376,11 @@ class InternalCommands:
print self.find_revision() print self.find_revision()
def find_revision(self): def find_revision(self):
p = subprocess.Popen(['svn', 'info'], stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True) p = subprocess.Popen(['svn', 'info'], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
stdout, stderr = p.communicate() stdout, stderr = p.communicate()
if p.returncode != 0: if p.returncode != 0:
raise Exception('Could not get revision info with error code code: ' + str(p.returncode)) raise Exception('Could not get revision - svn info failed with code: ' + str(p.returncode))
m = re.search('.*Revision: (\d+).*', stdout) m = re.search('.*Revision: (\d+).*', stdout)
if not m: if not m:

2
hm.py
View File

@ -169,7 +169,7 @@ def run_cmd(cmd, argv = []):
except: except:
if not verbose: if not verbose:
# print friendly error for users # print friendly error for users
sys.stderr.write('Error: ' + sys.exc_info()[1].__str__()) sys.stderr.write('Error: ' + sys.exc_info()[1].__str__() + '\n')
exit(1) exit(1)
else: else:
# if user wants to be verbose let python do it's thing # if user wants to be verbose let python do it's thing