From cd6f7a8c2cc3858324e194828283bc5a265a97f6 Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Thu, 5 Dec 2019 04:26:32 +0000 Subject: Thu Dec 5 04:26:32 UTC 2019 a/kernel-generic-5.4.2-x86_64-1.txz: Upgraded. a/kernel-huge-5.4.2-x86_64-1.txz: Upgraded. a/kernel-modules-5.4.2-x86_64-1.txz: Upgraded. d/kernel-headers-5.4.2-x86-1.txz: Upgraded. k/kernel-source-5.4.2-noarch-1.txz: Upgraded. l/netpbm-10.88.01-x86_64-1.txz: Upgraded. x/mesa-19.2.7-x86_64-1.txz: Upgraded. isolinux/initrd.img: Rebuilt. kernels/*: Upgraded. usb-and-pxe-installers/usbboot.img: Rebuilt. --- .../xap/mozilla-thunderbird/firefox.node.py.patch | 46 ---------------------- 1 file changed, 46 deletions(-) delete mode 100644 source/xap/mozilla-thunderbird/firefox.node.py.patch (limited to 'source/xap/mozilla-thunderbird/firefox.node.py.patch') diff --git a/source/xap/mozilla-thunderbird/firefox.node.py.patch b/source/xap/mozilla-thunderbird/firefox.node.py.patch deleted file mode 100644 index 11e2b843b..000000000 --- a/source/xap/mozilla-thunderbird/firefox.node.py.patch +++ /dev/null @@ -1,46 +0,0 @@ - -diff --git a/python/mozbuild/mozbuild/action/node.py b/python/mozbuild/mozbuild/action/node.py ---- a/python/mozbuild/mozbuild/action/node.py -+++ b/python/mozbuild/mozbuild/action/node.py -@@ -47,24 +47,35 @@ def execute_node_cmd(node_cmd_list): - printed to stderr instead. - """ - - try: - printable_cmd = ' '.join(pipes.quote(arg) for arg in node_cmd_list) - print('Executing "{}"'.format(printable_cmd), file=sys.stderr) - sys.stderr.flush() - -- output = subprocess.check_output(node_cmd_list) -+ # We need to redirect stderr to a pipe because -+ # https://github.com/nodejs/node/issues/14752 causes issues with make. -+ proc = subprocess.Popen( -+ node_cmd_list, stdout=subprocess.PIPE, stderr=subprocess.PIPE) -+ -+ stdout, stderr = proc.communicate() -+ retcode = proc.wait() -+ -+ if retcode != 0: -+ print(stderr, file=sys.stderr) -+ sys.stderr.flush() -+ sys.exit(retcode) - - # Process the node script output - # - # XXX Starting with an empty list means that node scripts can - # (intentionally or inadvertently) remove deps. Do we want this? - deps = [] -- for line in output.splitlines(): -+ for line in stdout.splitlines(): - if 'dep:' in line: - deps.append(line.replace('dep:', '')) - else: - print(line, file=sys.stderr) - sys.stderr.flush() - - return set(deps) - - - - - -- cgit v1.2.3