[pitivi] bin: Make sure we use python2 when python3 is the default
- From: Mathieu Duponchelle <mathieudu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pitivi] bin: Make sure we use python2 when python3 is the default
- Date: Fri, 28 Feb 2014 03:11:29 +0000 (UTC)
commit a96c7d646c081efc6d4f96f2480225c96ec82f1c
Author: Alexandru Băluț <alexandru balut gmail com>
Date: Fri Jan 17 14:36:34 2014 +0100
bin: Make sure we use python2 when python3 is the default
bin/pitivi-git-environment.sh | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/bin/pitivi-git-environment.sh b/bin/pitivi-git-environment.sh
index b5884ee..fbc5fc3 100755
--- a/bin/pitivi-git-environment.sh
+++ b/bin/pitivi-git-environment.sh
@@ -35,6 +35,8 @@ GOBJECT_INTROSPECTION_RELEASE_TAG="GOBJECT_INTROSPECTION_$(echo $GOBJECT_INTROSP
# Everything below this line shouldn't be edited!
#
+export PYTHON=python2
+
if ! pkg-config glib-2.0 --atleast-version=$GLIB_RELEASE_TAG; then
echo "Using a local build of glib"
MODULE_GLIB="glib"
@@ -50,10 +52,10 @@ else
echo "Using system-wide gobject-introspection-1.0"
fi
-if python2 -c "import gi; gi.check_version('${PYGOBJECT_RELEASE_TAG}')" &> /dev/null; then
+if $PYTHON -c "import gi; gi.check_version('${PYGOBJECT_RELEASE_TAG}')" &> /dev/null; then
echo "Using system-wide pygobject"
# Hack around PYTHONPATH ordering to support gi overrides
- PYTHONPATH=$(python2 -c 'import gi; print(gi._overridesdir)')/../../:$PYTHONPATH
+ PYTHONPATH=$($PYTHON -c 'import gi; print(gi._overridesdir)')/../../:$PYTHONPATH
else
echo "Using a local build of pygobject"
PYTHONPATH=$MYPITIVI/pygobject:$PYTHONPATH
@@ -330,7 +332,7 @@ if [ "$ready_to_run" != "1" ]; then
# Now compile that module
if test ! -f ./configure || [ "$force_autogen" == "1" ]; then
- ./autogen.sh --prefix=$PITIVI/prefix --disable-gtk-doc --with-python=python2
+ ./autogen.sh --prefix=$PITIVI/prefix --disable-gtk-doc --with-python=$PYTHON
if [ $? -ne 0 ]; then
echo "Could not run autogen for $m ; result: $?"
exit 1
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]