Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
denise 2012-04-30 16:21:13 -04:00
parent 4477ac02e7 db2ccb1859
commit a3b73bb3ac
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
install_minimal/include/airtime-installed-check.php
View File

@ -15,6 +15,8 @@ require_once(__DIR__.'/airtime-constants.php');
AirtimeInstall::ExitIfNotRoot();
if (!file_exists('/etc/airtime/airtime.conf')) {
#airtime.conf doesn't exist, and we need it to connect to database
#Assume Airtime is not installed.
return 0;
}

2
python_apps/python-virtualenv/virtualenv-install.sh
View File

@ -49,7 +49,7 @@ else
fi
echo -e "\n*** Installing Python Libraries ***"
/usr/lib/airtime/airtime_virtualenv/bin/pip install ${SCRIPTPATH}/airtime_virtual_env.pybundle -E /usr/lib/airtime/airtime_virtualenv || exit 1
/usr/lib/airtime/airtime_virtualenv/bin/pip install ${SCRIPTPATH}/airtime_virtual_env.pybundle || exit 1
echo -e "\n*** Patching Python Libraries ***"
PATCHES=${SCRIPTPATH}/patches/*