From e19bf33f516e890ac370875d78c9fcbb62d98abc Mon Sep 17 00:00:00 2001
From: James <james@sourcefabric-DX4840.(none)>
Date: Mon, 18 Jul 2011 17:04:46 -0400
Subject: [PATCH] temp comit

---
 install/airtime-install                         | 3 +++
 install/airtime-uninstall                       | 3 +++
 python_apps/media-monitor/airtime-media-monitor | 5 +++++
 python_apps/pypo/airtime-liquidsoap             | 4 ++++
 python_apps/pypo/airtime-playout                | 3 +++
 python_apps/show-recorder/airtime-show-recorder | 3 +++
 utils/airtime-import/airtime-import             | 4 +++-
 utils/airtime-import/airtime-import.py          | 2 +-
 8 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/install/airtime-install b/install/airtime-install
index f746e22b5..ce6224436 100755
--- a/install/airtime-install
+++ b/install/airtime-install
@@ -1,5 +1,8 @@
 #!/bin/bash
 
+virtualenv_bin="/home/james/temp/bin/"
+. ${virtualenv_bin}activate
+
 #Cause bash script to exit if any of the installers
 #return with a non-zero return value.
 set -e
diff --git a/install/airtime-uninstall b/install/airtime-uninstall
index 9f708e10f..5bdc51d9f 100755
--- a/install/airtime-uninstall
+++ b/install/airtime-uninstall
@@ -1,5 +1,8 @@
 #!/bin/bash
 
+virtualenv_bin="/home/james/temp/bin/"
+. ${virtualenv_bin}activate
+
 #Cause bash script to exit if any of the installers
 #return with a non-zero return value.
 set -e
diff --git a/python_apps/media-monitor/airtime-media-monitor b/python_apps/media-monitor/airtime-media-monitor
index c6f892fdf..8fbf6bf71 100755
--- a/python_apps/media-monitor/airtime-media-monitor
+++ b/python_apps/media-monitor/airtime-media-monitor
@@ -1,10 +1,15 @@
 #!/bin/sh
 
 # Location of pypo_cli.py Python script
+
+virtualenv_bin="/home/james/temp/bin/"
+. ${virtualenv_bin}activate
+
 media_monitor_path="/usr/lib/airtime/media-monitor/"
 media_monitor_script="MediaMonitor.py"
 
 api_client_path="/usr/lib/airtime/pypo/"
+
 cd ${media_monitor_path}
 
 exec 2>&1
diff --git a/python_apps/pypo/airtime-liquidsoap b/python_apps/pypo/airtime-liquidsoap
index d7fd805f7..dd30f42e6 100755
--- a/python_apps/pypo/airtime-liquidsoap
+++ b/python_apps/pypo/airtime-liquidsoap
@@ -1,4 +1,8 @@
 #!/bin/sh
+
+virtualenv_bin="/home/james/temp/bin/"
+. ${virtualenv_bin}activate
+
 ls_user="pypo"
 export HOME="/var/tmp/airtime/pypo/"
 api_client_path="/usr/lib/airtime/pypo/"
diff --git a/python_apps/pypo/airtime-playout b/python_apps/pypo/airtime-playout
index 0eb206f1c..22a35f620 100755
--- a/python_apps/pypo/airtime-playout
+++ b/python_apps/pypo/airtime-playout
@@ -1,5 +1,8 @@
 #!/bin/sh
 
+virtualenv_bin="/home/james/temp/bin/"
+. ${virtualenv_bin}activate
+
 pypo_user="pypo"
 
 # Location of pypo_cli.py Python script
diff --git a/python_apps/show-recorder/airtime-show-recorder b/python_apps/show-recorder/airtime-show-recorder
index 0bd0562e6..09ee88c49 100755
--- a/python_apps/show-recorder/airtime-show-recorder
+++ b/python_apps/show-recorder/airtime-show-recorder
@@ -1,5 +1,8 @@
 #!/bin/sh
 
+virtualenv_bin="/home/james/temp/bin/"
+. ${virtualenv_bin}activate
+
 recorder_user="pypo"
 
 
diff --git a/utils/airtime-import/airtime-import b/utils/airtime-import/airtime-import
index e18781929..1466fc6f1 100755
--- a/utils/airtime-import/airtime-import
+++ b/utils/airtime-import/airtime-import
@@ -1,6 +1,8 @@
 #!/bin/sh
 
-# Location of pypo_cli.py Python script
+virtualenv_bin="/home/james/temp/bin/"
+. ${virtualenv_bin}activate
+
 airtime_import_path="/usr/lib/airtime/utils/airtime-import/"
 airtime_import_script="airtime-import.py"
 
diff --git a/utils/airtime-import/airtime-import.py b/utils/airtime-import/airtime-import.py
index c5b29036c..7ea4ae7fc 100644
--- a/utils/airtime-import/airtime-import.py
+++ b/utils/airtime-import/airtime-import.py
@@ -195,7 +195,7 @@ def StorageSetAction(option, opt, value, parser):
             parser.rargs.remove('--force')
     if(not bypass):
         errorIfMultipleOption(parser.rargs, "Only [-f] and [--force] option is allowed with this option.")
-        possibleInput = {'y','Y','n','N'}
+        possibleInput = ['y','Y','n','N']
         confirm = raw_input("Are you sure you want to change the storage direcory? (y/N)")
         confirm = confirm or 'N'
         while(confirm  not in possibleInput):