Fixup for bug 1038639. r=me
authorMike Hommey <mh+mozilla@glandium.org>
Thu, 17 Jul 2014 09:37:21 +0900
changeset 194445 4cbe04a905ef870e2bc8b9fd76c0dfbe6d227cbd
parent 194444 8cf3f3b925a362186c6cdf408a46aa539d895db2
child 194521 5dbfea1a872395ff328c5b9df17c1eef931b71a5
push id46366
push usermh@glandium.org
push dateThu, 17 Jul 2014 00:38:07 +0000
treeherdermozilla-inbound@4cbe04a905ef [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme
bugs1038639
milestone33.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Fixup for bug 1038639. r=me
toolkit/mozapps/installer/packager.py
--- a/toolkit/mozapps/installer/packager.py
+++ b/toolkit/mozapps/installer/packager.py
@@ -373,17 +373,17 @@ def main():
                 continue
             key = JarLog.canonicalize(os.path.join(args.destination, p))
             if key in log:
                 f.preload(log[key])
 
     # Fill startup cache
     if isinstance(formatter, OmniJarFormatter) and launcher.can_launch() \
       and buildconfig.substs['MOZ_DISABLE_STARTUPCACHE'] != '1':
-        if buildconfig.substs['LIBXUL_SDK']:
+        if buildconfig.substs.get('LIBXUL_SDK'):
             gre_path = mozpack.path.join(buildconfig.substs['LIBXUL_DIST'],
                                          'bin')
         else:
             gre_path = None
         for base in sorted([[p for p in [mozpack.path.join('bin', b), b]
                             if os.path.exists(os.path.join(args.source, p))][0]
                            for b in sink.packager.get_bases()]):
             if not gre_path: