From cefdd5aab4eac4c5937bd8e8e355f4162586d1b3 Mon Sep 17 00:00:00 2001 From: Goffi Date: Fri, 18 Feb 2011 22:10:38 +0100 Subject: [PATCH] installation: fixed wokkel hack --- setup.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index ce950552..5c6383be 100644 --- a/setup.py +++ b/setup.py @@ -81,6 +81,7 @@ class custom_install(install): """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 @@ class custom_install(install): '%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:])