From ffc14f28cae80601c96a3cf2fad790995f304ef3 Mon Sep 17 00:00:00 2001 From: Jonas Hahnfeld Date: Tue, 1 Oct 2019 16:58:18 +0200 Subject: [PATCH] Explicitly reference Python 2 This should work on most distributions and is actually required for those that already switched python to Python 3. Others will probably follow... --- bin/build-architecture | 2 +- bin/build-platform | 2 +- bin/cygwin-packager | 2 +- bin/gib | 2 +- bin/gpkg | 2 +- bin/gub | 2 +- bin/gub-tester | 2 +- bin/gupdate | 2 +- gub.make | 2 +- gub/distcc.py | 2 +- gub/runner.py | 2 +- gub/specs/lilypond.py | 2 +- gub/versiondb.py | 2 +- gub/with-lock.py | 2 +- test-lily/cron-builder.py | 2 +- test-lily/dist-check.py | 2 +- test-lily/rsync-lily-doc.py | 2 +- test-lily/rsync-test.py | 2 +- test-lily/test-binary.py | 2 +- test-lily/upload.py | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/bin/build-architecture b/bin/build-architecture index 7ea764ee5..e68a4f6b3 100755 --- a/bin/build-architecture +++ b/bin/build-architecture @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python2 """ Copyright (c) 2005--2008 diff --git a/bin/build-platform b/bin/build-platform index bd7ddc8f4..fcd950fe3 100755 --- a/bin/build-platform +++ b/bin/build-platform @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python2 """ Copyright (c) 2005--2008 diff --git a/bin/cygwin-packager b/bin/cygwin-packager index dbfd5c12f..9099448ae 100755 --- a/bin/cygwin-packager +++ b/bin/cygwin-packager @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python2 """ diff --git a/bin/gib b/bin/gib index 91d98b644..a7811f493 100755 --- a/bin/gib +++ b/bin/gib @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python2 """ Copyright (c) 2005--2008 diff --git a/bin/gpkg b/bin/gpkg index bd3aab822..1d9892b2a 100755 --- a/bin/gpkg +++ b/bin/gpkg @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python2 """ gpkg - GUB package manager diff --git a/bin/gub b/bin/gub index 261e7f901..011eee181 100755 --- a/bin/gub +++ b/bin/gub @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python2 """ Copyright (c) 2005--2008 diff --git a/bin/gub-tester b/bin/gub-tester index 603fae125..2d0f070ec 100755 --- a/bin/gub-tester +++ b/bin/gub-tester @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python2 def argv0_relocation (): import os, sys diff --git a/bin/gupdate b/bin/gupdate index 08e6170dc..1bb9a4668 100755 --- a/bin/gupdate +++ b/bin/gupdate @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python2 """ Copyright (c) 2005--2009 diff --git a/gub.make b/gub.make index 272d30848..17eaeede3 100644 --- a/gub.make +++ b/gub.make @@ -1,5 +1,5 @@ CWD:=$(shell pwd) -PYTHON=python +PYTHON=python2 PYTHONPATH=. export PYTHONPATH diff --git a/gub/distcc.py b/gub/distcc.py index d39451f75..a8b05942e 100644 --- a/gub/distcc.py +++ b/gub/distcc.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 import os import re diff --git a/gub/runner.py b/gub/runner.py index 9399f3520..7d426eec8 100644 --- a/gub/runner.py +++ b/gub/runner.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python2 """ Copyright (c) 2005--2007 diff --git a/gub/specs/lilypond.py b/gub/specs/lilypond.py index 72117d706..859c4d53a 100644 --- a/gub/specs/lilypond.py +++ b/gub/specs/lilypond.py @@ -245,7 +245,7 @@ class LilyPond__darwin (LilyPond): ]) configure_flags = (LilyPond.configure_flags .replace ('--enable-rpath', '--disable-rpath')) - make_flags = ' TARGET_PYTHON="/usr/bin/env python"' + make_flags = ' TARGET_PYTHON="/usr/bin/env python2"' class LilyPond__darwin__ppc (LilyPond__darwin): def configure (self): diff --git a/gub/versiondb.py b/gub/versiondb.py index 4c3acf414..084cf468c 100644 --- a/gub/versiondb.py +++ b/gub/versiondb.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 """ Copyright (c) 2005--2007 diff --git a/gub/with-lock.py b/gub/with-lock.py index 5e0646ce7..2df95431d 100644 --- a/gub/with-lock.py +++ b/gub/with-lock.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 """ diff --git a/test-lily/cron-builder.py b/test-lily/cron-builder.py index ca37914cf..332a4be92 100755 --- a/test-lily/cron-builder.py +++ b/test-lily/cron-builder.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python2 # FIXME: replace `lilypond' with $package to make generic tester diff --git a/test-lily/dist-check.py b/test-lily/dist-check.py index 982e3d148..d63452419 100644 --- a/test-lily/dist-check.py +++ b/test-lily/dist-check.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python2 def argv0_relocation (): import os, sys diff --git a/test-lily/rsync-lily-doc.py b/test-lily/rsync-lily-doc.py index 68058e98e..62200bea4 100644 --- a/test-lily/rsync-lily-doc.py +++ b/test-lily/rsync-lily-doc.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python2 def argv0_relocation (): import os, sys diff --git a/test-lily/rsync-test.py b/test-lily/rsync-test.py index 25dc0a0e2..3f780e9e0 100644 --- a/test-lily/rsync-test.py +++ b/test-lily/rsync-test.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python2 import os import re diff --git a/test-lily/test-binary.py b/test-lily/test-binary.py index 7bd1b4568..b4da2919c 100755 --- a/test-lily/test-binary.py +++ b/test-lily/test-binary.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python2 import sys import os diff --git a/test-lily/upload.py b/test-lily/upload.py index f8b8437ce..e0cdc418d 100644 --- a/test-lily/upload.py +++ b/test-lily/upload.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python2 maintainer = "graham" maintainer_git_username = "philholmes"