summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2021-11-21 00:14:10 -0500
committerMoonchild <moonchild@palemoon.org>2022-04-07 15:45:01 +0200
commit6a0d77b68ca4eff8200f5905d89667cc469ecc43 (patch)
tree44930208ec7bdd9e72d12bfa8e0c61012dbb3414
parent3ceb3ee7efe946a400865cd9203754d9bccd7cbe (diff)
downloaduxp-6a0d77b68ca4eff8200f5905d89667cc469ecc43.tar.gz
Issue #1847 - Update generate_certdata.py so it matches what this
version of NSS expects.
-rw-r--r--security/generate_certdata.py13
1 files changed, 11 insertions, 2 deletions
diff --git a/security/generate_certdata.py b/security/generate_certdata.py
index 3cb1aae5bb..96622e8d2a 100644
--- a/security/generate_certdata.py
+++ b/security/generate_certdata.py
@@ -1,11 +1,20 @@
#!/usr/bin/env python
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
#
# 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)))
- return None \ No newline at end of file
+ env = dict(os.environ)
+ env['PERL'] = str(buildconfig.substs['PERL'])
+ output.write(subprocess.check_output([buildconfig.substs['PYTHON'],
+ inputs[0], inputs[2]], env=env))
+ return None