summaryrefslogtreecommitdiffstats
path: root/__root__
diff options
context:
space:
mode:
authorJan Pokorný <jpokorny@redhat.com>2015-04-07 18:34:48 +0200
committerJan Pokorný <jpokorny@redhat.com>2015-04-08 19:56:20 +0200
commit0f286858ec1da08effaadb36ec2a2f33614fb8be (patch)
tree20b2beb18c1ca7a24f462262278384ff6488079b /__root__
parenteab86dc545b7e9e346cb74a17c1b10df1cd212dc (diff)
downloadclufter-0f286858ec1da08effaadb36ec2a2f33614fb8be.tar.gz
clufter-0f286858ec1da08effaadb36ec2a2f33614fb8be.tar.xz
clufter-0f286858ec1da08effaadb36ec2a2f33614fb8be.zip
general: use python2 (sys.executable), not python (PEP 394)
Hopefully there is no major roadblock making this change unreasonable at this point in time (checked commonly used RHEL, Fedora, Debian/Ubuntu -- the latter also for seamless integration with Travis CI). Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
Diffstat (limited to '__root__')
-rw-r--r--__root__/doc/HACKING2
-rwxr-xr-x__root__/run-check2
-rwxr-xr-x__root__/run-dev4
-rwxr-xr-x__root__/run-sdist2
4 files changed, 5 insertions, 5 deletions
diff --git a/__root__/doc/HACKING b/__root__/doc/HACKING
index cb13c61..77882e6 100644
--- a/__root__/doc/HACKING
+++ b/__root__/doc/HACKING
@@ -2,7 +2,7 @@ Directly consuming the repo
---------------------------
After fetching local repo copy:
-$ python setup.py build
+$ python setup.py build # or python2 if it matters
$ ln -fs __root__/build/ccs_flatten .
$ # or ./run-check that should take care on its own
and you should be ready to go with:
diff --git a/__root__/run-check b/__root__/run-check
index c6a5f92..7d0517d 100755
--- a/__root__/run-check
+++ b/__root__/run-check
@@ -20,7 +20,7 @@ PATH="${PATH:+${PATH}:}$(
)"
unset s
-PYTHONEXEC="python -Es"
+PYTHONEXEC="python2 -Es"
echo "Current path: ${PATH}"
which ccs_flatten 2>/dev/null || (
diff --git a/__root__/run-dev b/__root__/run-dev
index 607ea75..347bb31 100755
--- a/__root__/run-dev
+++ b/__root__/run-dev
@@ -1,6 +1,6 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
# -*- coding: UTF-8 -*-
-# Copyright 2014 Red Hat, Inc.
+# Copyright 2015 Red Hat, Inc.
# Part of clufter project
# Licensed under GPLv2+ (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
"""Machinery entry point -- to be run from in-repo location"""
diff --git a/__root__/run-sdist b/__root__/run-sdist
index dd75d18..bce9572 100755
--- a/__root__/run-sdist
+++ b/__root__/run-sdist
@@ -5,6 +5,6 @@ pushd "$(git rev-parse --show-toplevel)"
git archive --format=tar HEAD | (
cd $(mktemp -d '/var/tmp/pkg-XXXXX') \
&& tar xf - \
- && python setup.py sdist -d "${OLDPWD}/__root__/dist")
+ && python2 setup.py sdist -d "${OLDPWD}/__root__/dist")
echo "New source tarball created: $(ls -1t __root__/dist | head -n1)"
popd