#!/usr/bin/python
#
-# Copyright (C) 2014 Simo Sorce <simo@redhat.com>
-#
-# see file 'COPYING' for use and warranty information
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# Copyright (C) 2014 Ipsilon project Contributors, for license see COPYING
import argparse
import os
subprocess.call(['sqlite3', '-init', sql, users_db, '.quit'])
trans_db = os.path.join(workdir, 'transactions.sqlite')
+ cachedir = os.path.join(workdir, 'cache')
with open(CONF_TEMPLATE) as f:
conf_template = f.read()
'instance': 'idp',
'staticdir': os.getcwd(),
'datadir': workdir,
+ 'cachedir': cachedir,
'admindb': admin_db,
'usersdb': users_db,
'transdb': trans_db,
penv.update(os.environ)
penv['PYTHONPATH'] = os.getcwd()
+ schema_init = os.path.join(os.getcwd(), 'ipsilon/install/ipsilon-upgrade-database')
exe = os.path.join(os.getcwd(), 'ipsilon/ipsilon')
if args['cleanup']:
os.symlink(os.path.join(os.getcwd(), 'ui'),
os.path.join(args['workdir'], 'ui'))
+ if not os.path.exists(os.path.join(args['workdir'], 'cache')):
+ # This is only used in quickrun. Apache serves this directly
+ os.makedirs(os.path.join(args['workdir'], 'cache'))
os.chdir(args['workdir'])
- p = subprocess.Popen([exe, conf], env=penv)
+ p = subprocess.Popen([schema_init, conf], env=penv)
p.wait()
+
+ if p.returncode == 0:
+ p = subprocess.Popen([exe, conf], env=penv)
+ p.wait()