diff --git a/patch/all/gecko/Bug-1061388-Explicitly-mention-PYTHON-when-invoking-.patch b/patch/all/gecko/Bug-1061388-Explicitly-mention-PYTHON-when-invoking-.patch index 0eeaf71d77160dd6f27803ba4da0302daa627800..fcc87d7c646644813439588d539c756c10dc5842 100644 --- a/patch/all/gecko/Bug-1061388-Explicitly-mention-PYTHON-when-invoking-.patch +++ b/patch/all/gecko/Bug-1061388-Explicitly-mention-PYTHON-when-invoking-.patch @@ -1,22 +1,27 @@ -From d0e3c68d82a9b350cbd27580fe24e93e09fe8c82 Mon Sep 17 00:00:00 2001 -From: Michael Vines <mvines@codeaurora.org> -Date: Mon, 1 Sep 2014 20:07:34 -0700 -Subject: [PATCH] Bug 1061388 - Explicitly mention $PYTHON when invoking +From 26264c71b8cacfa47900aa2ad314d372ec5c2a8d Mon Sep 17 00:00:00 2001 +From: Anshul Jain <anshulj@codeaurora.org> +Date: Wed, 5 Nov 2014 10:01:14 -0800 +Subject: [PATCH] Bug 1061388 - Explicitly mention PYTHON when invoking config.status +Change-Id: Id62173d7e3303a2dd781fac872415316688e09e0 +--- + build/subconfigure.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + diff --git a/build/subconfigure.py b/build/subconfigure.py -index 46454d0..ab400d6 100644 +index 0e257ed..9381910 100644 --- a/build/subconfigure.py +++ b/build/subconfigure.py -@@ -320,7 +320,7 @@ def run(data_file, objdir): - print 'running config.status in %s' % os.path.relpath(objdir, - os.getcwd()) +@@ -354,7 +354,7 @@ def run(objdir): sys.stdout.flush() -- ret = subprocess.call([data['shell'], '-c', './config.status'], -+ ret = subprocess.call([data['shell'], '-c', '$PYTHON ./config.status'], - cwd=objdir, env=data['env']) - - for f in contents: + try: + output += subprocess.check_output([data['shell'], '-c', +- './config.status'], stderr=subprocess.STDOUT, cwd=objdir, ++ '$PYTHON ./config.status'], stderr=subprocess.STDOUT, cwd=objdir, + env=data['env']) + except subprocess.CalledProcessError as e: + ret = e.returncode -- -1.8.5.2 (Apple Git-48) +1.8.2.1