From c15d599dba8172d166d04abbc159c376e7b5c797 Mon Sep 17 00:00:00 2001 From: James Date: Thu, 15 Sep 2011 12:28:31 -0400 Subject: [PATCH 1/2] CC-2827: Python shebangs should specify the version python2.6 - done --- python_apps/api_clients/api_client.py | 2 +- python_apps/media-monitor/install/media-monitor-install.py | 2 +- python_apps/media-monitor/install/media-monitor-uninstall.py | 2 +- python_apps/pypo/install/pypo-install.py | 2 +- python_apps/pypo/install/pypo-uninstall.py | 2 +- python_apps/pypo/pypo-cli.py | 2 +- python_apps/pypo/pypo-notify.py | 2 +- python_apps/pypo/util/status.py | 2 +- python_apps/show-recorder/install/recorder-install.py | 2 +- python_apps/show-recorder/install/recorder-uninstall.py | 2 +- utils/serbianLatinToCyrillicConverter.py | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/python_apps/api_clients/api_client.py b/python_apps/api_clients/api_client.py index 125717ff9..5043c1462 100755 --- a/python_apps/api_clients/api_client.py +++ b/python_apps/api_clients/api_client.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2.6 # -*- coding: utf-8 -*- ############################################################################### diff --git a/python_apps/media-monitor/install/media-monitor-install.py b/python_apps/media-monitor/install/media-monitor-install.py index c6e38b431..929413c09 100644 --- a/python_apps/media-monitor/install/media-monitor-install.py +++ b/python_apps/media-monitor/install/media-monitor-install.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2.6 # -*- coding: utf-8 -*- import time diff --git a/python_apps/media-monitor/install/media-monitor-uninstall.py b/python_apps/media-monitor/install/media-monitor-uninstall.py index 1c102f582..1d028afe6 100644 --- a/python_apps/media-monitor/install/media-monitor-uninstall.py +++ b/python_apps/media-monitor/install/media-monitor-uninstall.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2.6 # -*- coding: utf-8 -*- import os diff --git a/python_apps/pypo/install/pypo-install.py b/python_apps/pypo/install/pypo-install.py index 5c05129e7..ebe23c69d 100644 --- a/python_apps/pypo/install/pypo-install.py +++ b/python_apps/pypo/install/pypo-install.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2.6 # -*- coding: utf-8 -*- import time diff --git a/python_apps/pypo/install/pypo-uninstall.py b/python_apps/pypo/install/pypo-uninstall.py index d2596099b..9131a493c 100644 --- a/python_apps/pypo/install/pypo-uninstall.py +++ b/python_apps/pypo/install/pypo-uninstall.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2.6 # -*- coding: utf-8 -*- import os diff --git a/python_apps/pypo/pypo-cli.py b/python_apps/pypo/pypo-cli.py index 0c9fbb233..00fcdd45e 100644 --- a/python_apps/pypo/pypo-cli.py +++ b/python_apps/pypo/pypo-cli.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2.6 # -*- coding: utf-8 -*- """ diff --git a/python_apps/pypo/pypo-notify.py b/python_apps/pypo/pypo-notify.py index 754305748..255d7429c 100644 --- a/python_apps/pypo/pypo-notify.py +++ b/python_apps/pypo/pypo-notify.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2.6 # -*- coding: utf-8 -*- """ diff --git a/python_apps/pypo/util/status.py b/python_apps/pypo/util/status.py index c05340705..8dd893457 100644 --- a/python_apps/pypo/util/status.py +++ b/python_apps/pypo/util/status.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2.6 # -*- coding: utf-8 -*- import sys import time diff --git a/python_apps/show-recorder/install/recorder-install.py b/python_apps/show-recorder/install/recorder-install.py index 3d7ff1bc6..2417d38f0 100644 --- a/python_apps/show-recorder/install/recorder-install.py +++ b/python_apps/show-recorder/install/recorder-install.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2.6 # -*- coding: utf-8 -*- import time diff --git a/python_apps/show-recorder/install/recorder-uninstall.py b/python_apps/show-recorder/install/recorder-uninstall.py index 2b7fb1b55..a4363680c 100644 --- a/python_apps/show-recorder/install/recorder-uninstall.py +++ b/python_apps/show-recorder/install/recorder-uninstall.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2.6 # -*- coding: utf-8 -*- import os diff --git a/utils/serbianLatinToCyrillicConverter.py b/utils/serbianLatinToCyrillicConverter.py index 0ef31f060..809a2acf7 100644 --- a/utils/serbianLatinToCyrillicConverter.py +++ b/utils/serbianLatinToCyrillicConverter.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2.6 # -*- coding: utf-8 -*- #------------------------------------------------------------------------------- # Copyright (c) 2010 Sourcefabric O.P.S. From fb3b088f043c69a0042a889c2353cd7c12f61d47 Mon Sep 17 00:00:00 2001 From: James Date: Thu, 15 Sep 2011 12:30:45 -0400 Subject: [PATCH 2/2] CC-2826: airtime-full-install script should install patch package - done --- install_full/ubuntu/airtime-full-install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install_full/ubuntu/airtime-full-install b/install_full/ubuntu/airtime-full-install index 6e61a68de..3d37c9c85 100755 --- a/install_full/ubuntu/airtime-full-install +++ b/install_full/ubuntu/airtime-full-install @@ -27,7 +27,7 @@ apt-get -y install tar gzip curl apache2 php5-pgsql libapache2-mod-php5 \ php-pear php5-gd postgresql odbc-postgresql python2.6 lame libsoundtouch-ocaml \ libvorbis-ocaml-dev libmp3lame-dev libtaglib-ocaml libao-ocaml libmad-ocaml \ libesd0 icecast2 libportaudio2 libsamplerate0 libcamomile-ocaml-dev \ -ecasound php5-curl mpg123 rabbitmq-server monit python-virtualenv +ecasound php5-curl mpg123 rabbitmq-server monit python-virtualenv patch if [ "$?" -ne "0" ]; then echo ""