[Checkins] SVN: zc.buildout/branches/do3cc_exitcode/ Removed the exception handler for SystemExit. Changed some places so that update really works

[Patrick Gerken]

Log message for revision 115418:
  Removed the exception handler for SystemExit. Changed some places so that update really works

Changed:
  U   zc.buildout/branches/do3cc_exitcode/src/zc/buildout/buildout.py
  U   zc.buildout/branches/do3cc_exitcode/src/zc/buildout/easy_install.py
  U   zc.buildout/branches/do3cc_exitcode/src/zc/buildout/easy_install.txt
  U   zc.buildout/branches/do3cc_exitcode/src/zc/buildout/update.txt
  U   zc.buildout/branches/do3cc_exitcode/z3c.recipe.scripts_/src/z3c/recipe/scripts/tests.py

-=-
Modified: zc.buildout/branches/do3cc_exitcode/src/zc/buildout/buildout.py
===================================================================
--- zc.buildout/branches/do3cc_exitcode/src/zc/buildout/buildout.py	2010-08-03 22:37:44 UTC (rev 115417)
+++ zc.buildout/branches/do3cc_exitcode/src/zc/buildout/buildout.py	2010-08-04 01:14:41 UTC (rev 115418)
@@ -1726,8 +1726,8 @@
             buildout = Buildout(config_file, options,
                                 user_defaults, windows_restart, command)
             getattr(buildout, command)(args)
-        except SystemExit:
-            pass
+#        except SystemExit:
+#            pass
         except Exception, v:
             _doing()
             exc_info = sys.exc_info()

Modified: zc.buildout/branches/do3cc_exitcode/src/zc/buildout/easy_install.py
===================================================================
--- zc.buildout/branches/do3cc_exitcode/src/zc/buildout/easy_install.py	2010-08-03 22:37:44 UTC (rev 115417)
+++ zc.buildout/branches/do3cc_exitcode/src/zc/buildout/easy_install.py	2010-08-04 01:14:41 UTC (rev 115418)
@@ -1595,6 +1595,12 @@
     finally:
         site.close()
         real_site.close()
+    source_dir = os.path.join(*os.path.split(real_site_path)[:-1])
+    try:
+        orig_prefix = open(os.path.join(source_dir, 'orig-prefix.txt')).read()
+        open(os.path.join(dest, 'orig-prefix.txt'), 'w').write(open_prefix)
+    except IOError:
+        pass
     if not successful_rewrite:
         raise RuntimeError(
             'Buildout did not successfully rewrite %s to %s' %
@@ -1619,7 +1625,7 @@
         addsitedir(path, known_paths)'''
 
 addsitepackages_script = '''\
-def addsitepackages(known_paths):
+def addsitepackages(known_paths, sys_prefix='ignored'):
     """Add site packages, as determined by zc.buildout.
 
     See original_addsitepackages, below, for the original version."""%s

Modified: zc.buildout/branches/do3cc_exitcode/src/zc/buildout/easy_install.txt
===================================================================
--- zc.buildout/branches/do3cc_exitcode/src/zc/buildout/easy_install.txt	2010-08-03 22:37:44 UTC (rev 115417)
+++ zc.buildout/branches/do3cc_exitcode/src/zc/buildout/easy_install.txt	2010-08-04 01:14:41 UTC (rev 115418)
@@ -1091,7 +1091,7 @@
     >>> sys.stdout.write('#\n'); cat(site_path)
     ... # doctest: +ELLIPSIS +NORMALIZE_WHITESPACE
     #...
-    def addsitepackages(known_paths):
+    def addsitepackages(known_paths, sys_prefix='ignored'):
         """Add site packages, as determined by zc.buildout.
     <BLANKLINE>
         See original_addsitepackages, below, for the original version."""
@@ -1179,7 +1179,7 @@
 
     >>> sys.stdout.write('#\n'); cat(site_path) # doctest: +ELLIPSIS
     #...
-    def addsitepackages(known_paths):
+    def addsitepackages(known_paths, sys_prefix='ignored'):
         """Add site packages, as determined by zc.buildout.
     <BLANKLINE>
         See original_addsitepackages, below, for the original version."""
@@ -1214,7 +1214,7 @@
     ...     interpreter='py', extra_paths=[join(interpreter_dir, 'other')])
     >>> sys.stdout.write('#\n'); cat(site_path) # doctest: +ELLIPSIS
     #...
-    def addsitepackages(known_paths):
+    def addsitepackages(known_paths, sys_prefix='ignored'):
         """Add site packages, as determined by zc.buildout.
     <BLANKLINE>
         See original_addsitepackages, below, for the original version."""
@@ -1273,7 +1273,7 @@
     >>> sys.stdout.write('#\n'); cat(site_path)
     ... # doctest: +ELLIPSIS +NORMALIZE_WHITESPACE
     #...
-    def addsitepackages(known_paths):
+    def addsitepackages(known_paths, sys_prefix='ignored'):
         """Add site packages, as determined by zc.buildout.
     <BLANKLINE>
         See original_addsitepackages, below, for the original version."""
@@ -1343,7 +1343,7 @@
     >>> sys.stdout.write('#\n'); cat(site_path)
     ... # doctest: +ELLIPSIS +NORMALIZE_WHITESPACE
     #...
-    def addsitepackages(known_paths):
+    def addsitepackages(known_paths, sys_prefix='ignored'):
         """Add site packages, as determined by zc.buildout.
     <BLANKLINE>
         See original_addsitepackages, below, for the original version."""
@@ -1403,7 +1403,7 @@
     >>> sys.stdout.write('#\n'); cat(site_path)
     ... # doctest: +ELLIPSIS +NORMALIZE_WHITESPACE
     #...
-    def addsitepackages(known_paths):
+    def addsitepackages(known_paths, sys_prefix='ignored'):
         """Add site packages, as determined by zc.buildout.
     <BLANKLINE>
         See original_addsitepackages, below, for the original version."""

Modified: zc.buildout/branches/do3cc_exitcode/src/zc/buildout/update.txt
===================================================================
--- zc.buildout/branches/do3cc_exitcode/src/zc/buildout/update.txt	2010-08-03 22:37:44 UTC (rev 115417)
+++ zc.buildout/branches/do3cc_exitcode/src/zc/buildout/update.txt	2010-08-04 01:14:41 UTC (rev 115418)
@@ -83,7 +83,7 @@
     >>> cat(sample_buildout, 'parts', 'buildout', 'site.py')
     ... # doctest: +NORMALIZE_WHITESPACE +ELLIPSIS
     "...
-    def addsitepackages(known_paths):
+    def addsitepackages(known_paths, sys_prefix='ignored'):
         """Add site packages, as determined by zc.buildout.
     <BLANKLINE>
         See original_addsitepackages, below, for the original version."""

Modified: zc.buildout/branches/do3cc_exitcode/z3c.recipe.scripts_/src/z3c/recipe/scripts/tests.py
===================================================================
--- zc.buildout/branches/do3cc_exitcode/z3c.recipe.scripts_/src/z3c/recipe/scripts/tests.py	2010-08-03 22:37:44 UTC (rev 115417)
+++ zc.buildout/branches/do3cc_exitcode/z3c.recipe.scripts_/src/z3c/recipe/scripts/tests.py	2010-08-04 01:14:41 UTC (rev 115418)
@@ -225,7 +225,7 @@
     >>> sys.stdout.write('#'); cat(sample_buildout, 'parts', 'py', 'site.py')
     ... # doctest: +NORMALIZE_WHITESPACE +ELLIPSIS
     #...
-    def addsitepackages(known_paths):
+    def addsitepackages(known_paths, sys_prefix='ignored'):
         "..."
         join = os.path.join
         base = os.path.dirname(os.path.abspath(os.path.realpath(__file__)))