Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

This commit is contained in:
Yuchen Wang 2011-11-17 23:26:05 -05:00
commit c04e6dcc75
2 changed files with 5 additions and 2 deletions

View File

@ -22,4 +22,7 @@ $SCRIPTPATH/include/airtime-remove-files.sh
#Remove pypo user
python $SCRIPTPATH/../python_apps/remove-pypo-user.py
echo -e "\n****************************** Uninstall Complete *******************************"
echo -e "\n****************************** Uninstall Complete *******************************\n"
echo "NOTE: To fully remove all Airtime files, you will also have to manually delete"
echo " the directories '/srv/airtime'(default storage location of media files)"
echo -e " and '/etc/airtime'(where the config files are stored).\n"

View File

@ -35,7 +35,7 @@ def is_natty():
"""
def get_os_codename():
try:
p = Popen("which lsb_release", shell=True)
p = Popen("which lsb_release > /dev/null", shell=True)
sts = os.waitpid(p.pid, 0)[1]
if (sts == 0):