Bug#646598: A temporary patch

2012-01-20 Thread Troy Telford
A patch that works for me is the following; I'm basically making it so it 
doesn’t try to use /usr/bin/python (which is Python 2.7), and instead having it 
try /usr/bin/python2.6 first (which works).

First, for /usr/bin/caldavd
--- caldavd 2012-01-20 15:48:11.287759928 -0700
+++ /usr/bin/caldavd2012-01-20 15:45:50.183936151 -0700
@@ -46,7 +46,7 @@
   return 0;
 }
 
-for v in  2.6 2.5; do
+for v in 2.6 2.5; do
   for p in  \
 ${PYTHON:=}   \
 python${v}\


And for the init script:

diff --git a/init.d/calendarserver b/init.d/calendarserver
index b260b33..6b0d95b 100755
--- a/init.d/calendarserver
+++ b/init.d/calendarserver
@@ -57,7 +57,7 @@ case $1 in
   stop)
log_daemon_msg Stopping $DESC $NAME
if start-stop-daemon --oknodo --stop --quiet --pidfile $RUNDIR$NAME.pid 
\
-   --exec /usr/bin/python; then
+   --exec /usr/bin/python2.6; then
log_end_msg 0
RET=0
else
@@ -74,7 +74,7 @@ case $1 in
if check_start_daemon; then
log_daemon_msg Restarting $DESC $NAME
start-stop-daemon --stop --quiet --oknodo  --pidfile \
-   $RUNDIR$NAME.pid --exec /usr/bin/python
+   $RUNDIR$NAME.pid --exec /usr/bin/python2.6
sleep 1
if start-stop-daemon --start --quiet --pidfile \
$RUNDIR$NAME.pid --exec $DAEMON -- $DAEMON_OPTS 
2/dev/null; then


--
To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#646598: Patch that helps

2012-01-20 Thread Troy Telford
The following patch appears to work for me; all I'm doing is changing the 
script so it looks for the python2.6 binary, then the python2.5 binary.  (the 
default would also check the 'python' binary, which is a link to python2.7 - 
and it's the use of python2.7 that is breaking things.

--- caldavd 2012-01-20 15:48:11.287759928 -0700
+++ /usr/bin/caldavd2012-01-20 15:45:50.183936151 -0700
@@ -46,7 +46,7 @@
   return 0;
 }
 
-for v in  2.6 2.5; do
+for v in 2.6 2.5; do
   for p in  \
 ${PYTHON:=}   \
 python${v} 
--
Troy Telford
ttelf...@me.com




-- 
To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org