Bug 1345368 - adapt to new NSS certdata.py, r=ted
authorFranziskus Kiefer <franziskuskiefer@gmail.com>
Tue, 06 Jun 2017 09:59:42 +0200
changeset 362669 b55ffc5807df6fb7d563c7af86f02d13ce32a816
parent 362668 d93732fda32c91fe001f203f84abf52d30a4deca
child 362670 b14e3c9ba39cc0b09eb75025a1ec44eb0ebcd576
push id31987
push userryanvm@gmail.com
push dateThu, 08 Jun 2017 02:55:14 +0000
treeherdermozilla-central@7efda263a842 [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