Merging -r 1193 from lp:ipython.

setupegg.py

@@ -5,8 +5,6 b' import sys'
 
 # now, import setuptools and call the actual setup
 import setuptools
-# print sys.argv
-#sys.argv=['','bdist_egg']
 execfile('setup.py')
 
 # clean up the junk left around by setuptools

tools/mkrel.py

@@ -30,8 +30,8 b' c("python2.6 ./setup.py bdist_rpm --binary-only --release=py26 "'
   "--python=/usr/bin/python2.6")
 
 # Build eggs
-c('python2.5 ./eggsetup.py bdist_egg')
-c('python2.6 ./eggsetup.py bdist_egg')
+c('python2.5 ./setupegg.py bdist_egg')
+c('python2.6 ./setupegg.py bdist_egg')
 
 # Call the windows build separately, so that the extra Windows scripts don't
 # get pulled into Unix builds (setup.py has code which checks for

tools/toollib.py

@@ -14,8 +14,8 b' cd = os.chdir'
 def c(cmd):
     """Run system command, raise SystemExit if it returns an error."""
     print "$",cmd
-    #stat = os.system(cmd)
-    stat = 0  # Uncomment this and comment previous to run in debug mode
+    stat = os.system(cmd)
+    #stat = 0  # Uncomment this and comment previous to run in debug mode
     if stat:
         raise SystemExit("Command %s failed with code: %s" % (cmd, stat))