From 4b0553a3c2c9fd02fae39e2cf11b3d3e984a7f04 Mon Sep 17 00:00:00 2001 From: "rhelmer%mozilla.com" Date: Fri, 18 Jan 2008 16:58:31 +0000 Subject: [PATCH] not finding buildid should not be fatal, warn instead b=410806 r=bsmedberg git-svn-id: svn://10.0.0.236/trunk@243451 18797224-902f-48f8-a5cc-f745e15eee43 --- .../tools/update-packaging/make_incremental_updates.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/mozilla/tools/update-packaging/make_incremental_updates.py b/mozilla/tools/update-packaging/make_incremental_updates.py index e570f927759..d3ebb71e8f7 100755 --- a/mozilla/tools/update-packaging/make_incremental_updates.py +++ b/mozilla/tools/update-packaging/make_incremental_updates.py @@ -308,15 +308,22 @@ def usage(): print "-f for patchlist_file" 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': ini = '%s/Contents/MacOS/application.ini' % work_dir else: 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) for line in file: if line.find('BuildID') == 0: return line.strip().split('=')[1] + print 'WARNING: cannot find build ID in application.ini' + return '' def decode_filename(filename): """ Breaks filename into component parts based on regex