diff --git a/setup.py b/setup.py index 69b1c8cf..5439be74 100644 --- a/setup.py +++ b/setup.py @@ -92,7 +92,7 @@ class custom_install(install): 'cd wokkel', '%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 commit -u "SaT installation script" -m "Merged wokkel\'s MUC branch"' % hg_path, '%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 '): @@ -117,6 +117,7 @@ class custom_install(install): def run(self): install.run(self) sys.stdout.write ('running post installation stuff\n') + sys.stdout.flush() self.sh_script_path = os.path.join(self.install_lib,'sat','sat.sh') self.primitivus_path = os.path.join(self.install_lib,'sat_frontends','primitivus') self.custom_auto_options() @@ -174,10 +175,12 @@ def preinstall_check(): if sys.argv[1].lower() in ['egg_info','install']: #we only check dependencies if egg_info or install is used - preinstall_check() + install_opt = os.environ.get("SAT_INSTALL","") + if not "nopreinstall" in install_opt: #user can force preinstall skipping + preinstall_check() setup(name=NAME, - version='0.1.1', + version='0.2.0', description=u'Salut à Toi multi-frontend XMPP client', long_description=u'Salut à Toi (SàT) is a XMPP client based on a daemon/frontend architecture. You can use it with the desktop frontend (wix - WxPython based), console ui frontend (Primitivus, Urwid based), or command line frontend (jp), and others are coming. ', author='Goffi (Jérôme Poisson)',