Merge pull request #445 from nyuszika7h/testing

Fixes for supybot-botchk
This commit is contained in:
Valentin Lorentz 2013-02-03 05:43:48 -08:00
commit 49a392717e

View File

@ -97,7 +97,8 @@ if __name__ == '__main__':
parser.error('No conffile given.') parser.error('No conffile given.')
os.chdir(options.botdir) os.chdir(options.botdir)
os.system('touch %s' % options.pidfile) pidfile = open(options.pidfile, 'ab')
pidfile.close()
pid = None pid = None
try: try:
@ -132,7 +133,7 @@ if __name__ == '__main__':
inst.stdin.write('source %s' % filename + os.linesep) inst.stdin.write('source %s' % filename + os.linesep)
cmdline = '%s --daemon %s' % (options.supybot, options.conffile) cmdline = '%s --daemon %s' % (options.supybot, options.conffile)
debug('Sending cmdline to sh process.') debug('Sending cmdline to sh process.')
inst.stdin.write(cmdline + os.linesep) inst.stdin.write(cmdline.encode('utf-8') + os.linesep.encode('utf-8'))
inst.stdin.close() inst.stdin.close()
debug('Received from sh process: %r' % inst.stdout.read()) debug('Received from sh process: %r' % inst.stdout.read())
ret = inst.wait() ret = inst.wait()