[or-cvs] r17430: {updater} Only pass the console argument to distutils if it knows how (updater/trunk)

nickm at seul.org nickm at seul.org
Mon Dec 1 16:01:59 UTC 2008


Author: nickm
Date: 2008-12-01 11:01:59 -0500 (Mon, 01 Dec 2008)
New Revision: 17430

Modified:
   updater/trunk/setup.py
Log:
Only pass the console argument to distutils if it knows how to cope with it.  Otherwise, distutils warns.

Modified: updater/trunk/setup.py
===================================================================
--- updater/trunk/setup.py	2008-12-01 15:49:08 UTC (rev 17429)
+++ updater/trunk/setup.py	2008-12-01 16:01:59 UTC (rev 17430)
@@ -11,10 +11,10 @@
 #
 #   Current Thandy version
 #
-VERSION = '0.0.1-alpha'
-# System: 0==alpha, 50==beta, 98=pre, 99==release candidate, 100==release
-VERSION_INFO = (0,0,1)
+VERSION = '0.0.2-alpha'
 
+VERSION_INFO = (0,0,2)
+
 try:
     import Crypto
 except ImportError:
@@ -119,6 +119,11 @@
 
         distutils.command.install.install.run(self)
 
+extra_args = { }
+if 'py2exe' in sys.argv:
+    # Tells the py2exe executable what module to actually execute.
+    extra_args["console"] = 'lib/thandy/ClientCLI.py'
+
 setup(name='Thandy',
       version=VERSION,
       license="3-clause BSD",
@@ -131,7 +136,6 @@
       packages=['thandy', 'thandy.packagesys'],
       scripts=SCRIPTS,
       cmdclass={'install': InstallCommand},
-      # Tells the py2exe executable what module to actually execute
-      console=['lib/thandy/ClientCLI.py'],
+      **extra_args
 )
 



More information about the tor-commits mailing list