From 141d27bf27d06a2b747cfc71d0582b611d2ac2d0 Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin.konecny@gmail.com>
Date: Mon, 30 Apr 2012 17:06:35 -0400
Subject: [PATCH] CC-3736: Full Install fail at Ubuntu 12.04

-various fixes
---
 python_apps/api_clients/api_client.py                       | 3 ---
 .../media-monitor/airtimefilemonitor/mediamonitorcommon.py  | 1 -
 python_apps/pypo/install/pypo-initialize.py                 | 4 +++-
 python_apps/python-virtualenv/virtualenv-install.sh         | 6 +++---
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/python_apps/api_clients/api_client.py b/python_apps/api_clients/api_client.py
index c98b0358c..b2aa1d586 100755
--- a/python_apps/api_clients/api_client.py
+++ b/python_apps/api_clients/api_client.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python2.6
-# -*- coding: utf-8 -*-
-
 ###############################################################################
 # This file holds the implementations for all the API clients.
 #
diff --git a/python_apps/media-monitor/airtimefilemonitor/mediamonitorcommon.py b/python_apps/media-monitor/airtimefilemonitor/mediamonitorcommon.py
index 7a6e833c1..b28b1dfcd 100644
--- a/python_apps/media-monitor/airtimefilemonitor/mediamonitorcommon.py
+++ b/python_apps/media-monitor/airtimefilemonitor/mediamonitorcommon.py
@@ -64,7 +64,6 @@ class MediaMonitorCommon:
         except IOError:
             self.logger.warn("File does not have correct permissions: '%s'", filepath)
             readable = False
-            self.logger.error("traceback: %s", traceback.format_exc())
         except Exception, e:
             self.logger.error("Unexpected exception thrown: %s", e)
             readable = False
diff --git a/python_apps/pypo/install/pypo-initialize.py b/python_apps/pypo/install/pypo-initialize.py
index 10d9d9bcd..79cf8a396 100644
--- a/python_apps/pypo/install/pypo-initialize.py
+++ b/python_apps/pypo/install/pypo-initialize.py
@@ -100,10 +100,12 @@ try:
         print e
         sys.exit(1)
     
+    logging.basicConfig(format='%(asctime) %(message)s')
+    logger = logging.getLogger()
             
     #generate liquidsoap config file
     #access the DB and generate liquidsoap.cfg under /etc/airtime/
-    ac = api_client.api_client_factory(config)
+    ac = api_client.api_client_factory(config, logger)
     ss = ac.get_stream_setting()
         
     if ss is not None:
diff --git a/python_apps/python-virtualenv/virtualenv-install.sh b/python_apps/python-virtualenv/virtualenv-install.sh
index 152492be5..47769ba89 100755
--- a/python_apps/python-virtualenv/virtualenv-install.sh
+++ b/python_apps/python-virtualenv/virtualenv-install.sh
@@ -38,14 +38,14 @@ echo -e "\n*** Creating Virtualenv for Airtime ***"
 EXTRAOPTION=$(virtualenv --help | grep extra-search-dir)
 
 if [ "$?" -eq "0" ]; then
-    virtualenv --extra-search-dir=${SCRIPTPATH}/3rd_party --no-site-package -p /usr/bin/python2.6 /usr/lib/airtime/airtime_virtualenv 2>/dev/null || exit 1
+    virtualenv --extra-search-dir=${SCRIPTPATH}/3rd_party --no-site-package -p /usr/bin/python /usr/lib/airtime/airtime_virtualenv 2>/dev/null || exit 1
 else
     # copy distribute-0.6.10.tar.gz to /usr/share/python-virtualenv/
     # this is due to the bug in virtualenv 1.4.9
     if [ -d "$VIRTUAL_ENV_SHARE" ]; then
         cp ${SCRIPTPATH}/3rd_party/distribute-0.6.10.tar.gz /usr/share/python-virtualenv/
     fi
-    virtualenv --no-site-package -p /usr/bin/python2.6 /usr/lib/airtime/airtime_virtualenv 2>/dev/null || exit 1
+    virtualenv --no-site-package -p /usr/bin/python /usr/lib/airtime/airtime_virtualenv 2>/dev/null || exit 1
 fi
 
 echo -e "\n*** Installing Python Libraries ***"
@@ -58,7 +58,7 @@ if [ -d $file ]; then
     DIRNAME=$(basename $file)
     echo -e "\n   ---Applying Patches for $DIRNAME---"
 else
-    patch -N -p0 -i $file
+    patch -N -p7 -i $file -d /usr/lib/airtime/airtime_virtualenv/lib/python2.7/
 fi
 done
 exit 0