Bug 1090219 - SeaMonkey updates for release jobs fail. r-pending=rstrong. a=Callek for CLOSED TREE on a relbranch SEA_COMM340_20141020_RELBRANCH SEAMONKEY_2_31b1_BUILD1 SEAMONKEY_2_31b1_RELEASE
authorJustin Wood <Callek@gmail.com>
Tue, 28 Oct 2014 22:06:04 -0400
branchSEA_COMM340_20141020_RELBRANCH
changeset 225842 625cd745ca82dc467b91fb04f47a71212e4cf7b3
parent 225762 e24611c45034095e6813a6a05de6e52b32f6ec87
child 225844 4cffb524f0879933bd8b612e74637ae6e4497873
push id4036
push userCallek@gmail.com
push dateWed, 29 Oct 2014 02:06:30 +0000
treeherdermozilla-beta@625cd745ca82 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersCallek
bugs1090219
milestone34.0
Bug 1090219 - SeaMonkey updates for release jobs fail. r-pending=rstrong. a=Callek for CLOSED TREE on a relbranch - due to being unable to find BuildID on OSX from pre-v2 signing format changes.
tools/update-packaging/make_incremental_updates.py
--- a/tools/update-packaging/make_incremental_updates.py
+++ b/tools/update-packaging/make_incremental_updates.py
@@ -413,18 +413,21 @@ def usage():
 
 def get_buildid(work_dir):
     """ extracts buildid from MAR
     """
     ini = '%s/application.ini' % work_dir
     if not os.path.exists(ini):
         ini = '%s/Contents/Resources/application.ini' % work_dir
         if not os.path.exists(ini):
-            print 'WARNING: application.ini not found, cannot find build ID'
-            return ''
+            # Try the old (pre Gecko 34) location
+            ini = '%s/Contents/MacOS/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 ''