Mercurial > libervia-backend
changeset 294:9821e3dde550
installation: wokkel hack now use specific revision to avoid merge conflict, and use the same options as for the parent setup.py
author | Goffi <goffi@goffi.org> |
---|---|
date | Fri, 18 Feb 2011 22:01:33 +0100 (2011-02-18) |
parents | 42438e43104a |
children | 5e00f8123001 |
files | setup.py |
diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/setup.py Tue Feb 08 02:16:26 2011 +0100 +++ b/setup.py Fri Feb 18 22:01:33 2011 +0100 @@ -87,12 +87,12 @@ os.chdir(work_path) hg_path = subprocess.Popen('which hg', stdout=subprocess.PIPE, shell=True).communicate()[0][:-1] #we are now in a temp dir, we can get the repositories - commands = ['%s clone http://hg.ik.nu/wokkel wokkel' % hg_path, + commands = ['%s clone http://hg.ik.nu/wokkel -r f9cd8ca1a62d' % hg_path, #XXX: we use specific revision to avoid merge conflict 'cd wokkel', - '%s pull -f http://hg.ik.nu/ralphm/wokkel-muc-client-support-24-2' % hg_path, + '%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 install' % sys.executable] + '%s setup.py %s' % (sys.executable, 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:])