use log_dir for log() and exit() as well

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4247 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2005-09-08 19:17:18 +00:00
parent 50a77027d2
commit 34693279d0

View file

@ -89,14 +89,14 @@ newverdir = 'nsis-%s-src' % VERSION
### some useful functions
def log(msg):
def log(msg, log_dir = '.'):
open('release.log', 'a').write(msg + '\n')
def exit():
log('\nerror occured, exiting')
def exit(log_dir = '.'):
log('\nerror occured, exiting', log_dir)
def run(command, log_name, err, wanted_ret = 0, log_dir = '.'):
log('running %s' % command)
log('running %s' % command, log_dir)
if log_name:
cmd = '%s >> %s\\release.log 2>&1' % (command, log_dir)
@ -105,10 +105,10 @@ def run(command, log_name, err, wanted_ret = 0, log_dir = '.'):
if os.system(cmd) != wanted_ret:
print '*** ' + err
log('*** ' + err)
exit()
log('*** ' + err, log_dir)
exit(log_dir)
log('')
log('', log_dir)
def confirm(question):
print question