guess correct version of Python for Arch Linux patch by Andrew Ash and Paul Cannon for CASSANDRA-4090
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c9f88103 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c9f88103 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c9f88103 Branch: refs/heads/cassandra-1.1.0 Commit: c9f88103d0a75d838e12ba7037b3893abba65421 Parents: 062ee3f Author: Jonathan Ellis <jbel...@apache.org> Authored: Tue Apr 3 11:12:13 2012 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Tue Apr 3 11:12:13 2012 -0500 ---------------------------------------------------------------------- CHANGES.txt | 4 ++++ bin/cqlsh | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c9f88103/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 457b8cc..579b3a5 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,3 +1,7 @@ +1.0.10 + * cqlsh: guess correct version of Python for Arch Linux (CASSANDRA-4090) + + 1.0.9 * improve index sampling performance (CASSANDRA-4023) * always compact away deleted hints immediately after handoff (CASSANDRA-3955) http://git-wip-us.apache.org/repos/asf/cassandra/blob/c9f88103/bin/cqlsh ---------------------------------------------------------------------- diff --git a/bin/cqlsh b/bin/cqlsh index 7431bee..7a9d0a3 100755 --- a/bin/cqlsh +++ b/bin/cqlsh @@ -20,7 +20,7 @@ """:" # bash code here; finds a suitable python interpreter and execs this file. # prefer unqualified "python" if suitable: -python -c 'import sys; sys.exit(sys.hexversion < 0x020500b0)' 2>/dev/null \ +python -c 'import sys; sys.exit(not (0x020500b0 < sys.hexversion < 0x03000000))' 2>/dev/null \ && exec python "$0" "$@" for pyver in 2.6 2.7 2.5; do which python$pyver > /dev/null 2>&1 && exec python$pyver "$0" "$@"
