Bug 1345368 - adapt to new NSS certdata.py, r=ted
☠☠ backed out by 99e99af157c2 ☠ ☠
authorFranziskus Kiefer <franziskuskiefer@gmail.com>
Tue, 06 Jun 2017 09:59:42 +0200
changeset 413021 952cf10f8d8afa91d5b4e86702febfb0f19aa91e
parent 413020 b5195ecbebe63d1a72448636283040c5a16ee5d4
child 413022 ddbdc9be58794424f500b0292c905fe4a2c92379
push id1490
push usermtabara@mozilla.com
push dateMon, 31 Jul 2017 14:08:16 +0000
treeherdermozilla-release@70e32e6bf15e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs1345368
milestone55.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
Bug 1345368 - adapt to new NSS certdata.py, r=ted UPGRADE_NSS_RELEASE
security/generate_certdata.py
--- a/security/generate_certdata.py
+++ b/security/generate_certdata.py
@@ -1,11 +1,15 @@
 #!/usr/bin/env python
 #
 # This exists to paper over differences between gyp's `action` definitions
 # and moz.build `GENERATED_FILES` semantics.
 
 import buildconfig
+import os
 import subprocess
 
 def main(output, *inputs):
-    output.write(subprocess.check_output([buildconfig.substs['PERL']] + list(inputs)))
+    env=dict(os.environ)
+    env['PERL'] = buildconfig.substs['PERL']
+    output.write(subprocess.check_output([buildconfig.substs['PYTHON'],
+                 inputs[0], inputs[2]], env=env))
     return None