summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Bronder <jsbronder@gentoo.org>2013-01-11 19:53:53 +0000
committerJustin Bronder <jsbronder@gentoo.org>2013-01-11 19:53:53 +0000
commit8671a9490d82973741ed46cdb64a28d16dc85c9e (patch)
tree792bcb8c88945553f0ccb692278bfd353324493a /net-nntp
parentremove old versions (diff)
downloadgentoo-2-8671a9490d82973741ed46cdb64a28d16dc85c9e.tar.gz
gentoo-2-8671a9490d82973741ed46cdb64a28d16dc85c9e.tar.bz2
gentoo-2-8671a9490d82973741ed46cdb64a28d16dc85c9e.zip
Wrap sabnzbd.py with either python2.7 or python2.6. Resolves #450698.
(Portage version: 2.1.11.38/cvs/Linux x86_64, signed Manifest commit with key 4D7043C9)
Diffstat (limited to 'net-nntp')
-rw-r--r--net-nntp/sabnzbd/ChangeLog5
-rw-r--r--net-nntp/sabnzbd/files/sabnzbd13
2 files changed, 16 insertions, 2 deletions
diff --git a/net-nntp/sabnzbd/ChangeLog b/net-nntp/sabnzbd/ChangeLog
index 0e64d9b5fcff..56e7a1901100 100644
--- a/net-nntp/sabnzbd/ChangeLog
+++ b/net-nntp/sabnzbd/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for net-nntp/sabnzbd
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nntp/sabnzbd/ChangeLog,v 1.5 2013/01/07 01:06:28 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/sabnzbd/ChangeLog,v 1.6 2013/01/11 19:53:53 jsbronder Exp $
+
+ 11 Jan 2013; Justin Bronder <jsbronder@gentoo.org> files/sabnzbd:
+ Wrap sabnzbd.py with either python2.7 or python2.6. Resolves #450698.
07 Jan 2013; Zac Medico <zmedico@gentoo.org> Manifest:
Fix incorrect Manifest entry for SABnzbd-0.7.9-src.tar.gz.
diff --git a/net-nntp/sabnzbd/files/sabnzbd b/net-nntp/sabnzbd/files/sabnzbd
index 33aaf7bcbc2a..ccc1a67fcf71 100644
--- a/net-nntp/sabnzbd/files/sabnzbd
+++ b/net-nntp/sabnzbd/files/sabnzbd
@@ -1,3 +1,14 @@
#!/bin/sh
-cd /usr/share/sabnzbd && python SABnzbd.py $*
+pyexe=python2.7
+
+if [ ! -x /usr/bin/${pyexe} ]; then
+ pyexe=python2.6
+fi
+
+if [ ! -x /usr/bin/${pyexe} ]; then
+ echo "No suitable python executable found in /usr/sbin (python2.6 || python2.7)"
+ exit 1
+fi
+
+cd /usr/share/sabnzbd && /usr/bin/${pyexe} SABnzbd.py $*