зеркало из https://github.com/mozilla/pjs.git
not finding buildid should not be fatal, warn instead b=410806 r=bsmedberg
This commit is contained in:
Родитель
35b545db1c
Коммит
2e46fce2a2
|
@ -308,15 +308,22 @@ def usage():
|
||||||
print "-f for patchlist_file"
|
print "-f for patchlist_file"
|
||||||
|
|
||||||
def get_buildid(work_dir, platform):
|
def get_buildid(work_dir, platform):
|
||||||
""" extracts buildid from MAR """
|
""" extracts buildid from MAR
|
||||||
|
TODO: this should handle 1.8 branch too
|
||||||
|
"""
|
||||||
if platform == 'mac':
|
if platform == 'mac':
|
||||||
ini = '%s/Contents/MacOS/application.ini' % work_dir
|
ini = '%s/Contents/MacOS/application.ini' % work_dir
|
||||||
else:
|
else:
|
||||||
ini = '%s/application.ini' % work_dir
|
ini = '%s/application.ini' % work_dir
|
||||||
|
if not os.path.exists(ini):
|
||||||
|
print 'WARNING: application.ini not found, cannot find build ID'
|
||||||
|
return ''
|
||||||
file = bz2.BZ2File(ini)
|
file = bz2.BZ2File(ini)
|
||||||
for line in file:
|
for line in file:
|
||||||
if line.find('BuildID') == 0:
|
if line.find('BuildID') == 0:
|
||||||
return line.strip().split('=')[1]
|
return line.strip().split('=')[1]
|
||||||
|
print 'WARNING: cannot find build ID in application.ini'
|
||||||
|
return ''
|
||||||
|
|
||||||
def decode_filename(filename):
|
def decode_filename(filename):
|
||||||
""" Breaks filename into component parts based on regex
|
""" Breaks filename into component parts based on regex
|
||||||
|
|
Загрузка…
Ссылка в новой задаче