# HG changeset patch # User Goffi # Date 1298063438 -3600 # Node ID 5e00f8123001610a0882d297315be8dff7218e82 # Parent 9821e3dde5502adbb3f40bb1c410d12b51909aa2 installation: fixed wokkel hack diff -r 9821e3dde550 -r 5e00f8123001 setup.py --- a/setup.py Fri Feb 18 22:01:33 2011 +0100 +++ b/setup.py Fri Feb 18 22:10:38 2011 +0100 @@ -81,6 +81,7 @@ """Test if the custom wokkel is present, else get and build it""" if not module_installed('wokkel.muc'): sys.stdout.write ('Custom wokkel is not present, building it\n') + sys.stdout.flush() import tempfile ori_path = os.getcwd() work_path = tempfile.mkdtemp() @@ -92,7 +93,7 @@ '%s pull -f http://hg.ik.nu/ralphm/wokkel-muc-client-support-24-2 -r 1b19c49d30c2' % hg_path, '%s merge wokkel-muc-client-support-24' % hg_path, '%s commit -u "SàT installation script" -m "Merged wokkel\'s MUC branch"' % hg_path, - '%s setup.py %s' % (sys.executable, sys.argv[1:])] #XXX: we use the same arguments as for this setup.py + '%s setup.py %s' % (sys.executable, ' '.join(sys.argv[1:]))] #XXX: we use the same arguments as for this setup.py for command in commands: if command.startswith('cd '): os.chdir(command[3:])