[Checkins] SVN: zc.sourcerelease/trunk/src/zc/sourcerelease/ Fixed a latent bug that was exposed by recent changes to zc.buildout.

[Jim Fulton]

Log message for revision 104531:
  Fixed a latent bug that was exposed by recent changes to zc.buildout.
  
  The bug causes installation scripts included in source releases to fail.
  

Changed:
  U   zc.sourcerelease/trunk/src/zc/sourcerelease/CHANGES.txt
  U   zc.sourcerelease/trunk/src/zc/sourcerelease/README.txt
  U   zc.sourcerelease/trunk/src/zc/sourcerelease/__init__.py

-=-
Modified: zc.sourcerelease/trunk/src/zc/sourcerelease/CHANGES.txt
===================================================================
--- zc.sourcerelease/trunk/src/zc/sourcerelease/CHANGES.txt	2009-09-25 14:57:39 UTC (rev 104530)
+++ zc.sourcerelease/trunk/src/zc/sourcerelease/CHANGES.txt	2009-09-25 15:23:42 UTC (rev 104531)
@@ -1,7 +1,14 @@
 Release History
 ===============
 
-0.3 (unreleased)
+0.3.1 (2009-09-25)
+------------------
+
+Fixed a latent bug that was exposed by recent changes to zc.buildout.
+
+The bug causes installation scripts included in source releases to fail.
+
+0.3 (sometime :)
 ----------------
 
 New Features

Modified: zc.sourcerelease/trunk/src/zc/sourcerelease/README.txt
===================================================================
--- zc.sourcerelease/trunk/src/zc/sourcerelease/README.txt	2009-09-25 14:57:39 UTC (rev 104530)
+++ zc.sourcerelease/trunk/src/zc/sourcerelease/README.txt	2009-09-25 15:23:42 UTC (rev 104531)
@@ -182,6 +182,7 @@
 server. Now, let's run the installer:
 
     >>> import sys
+
     >>> print system(sys.executable+' '+join('test', 'sample', 'install.py')),
     ... # doctest: +ELLIPSIS
     Creating directory ...

Modified: zc.sourcerelease/trunk/src/zc/sourcerelease/__init__.py
===================================================================
--- zc.sourcerelease/trunk/src/zc/sourcerelease/__init__.py	2009-09-25 14:57:39 UTC (rev 104530)
+++ zc.sourcerelease/trunk/src/zc/sourcerelease/__init__.py	2009-09-25 15:23:42 UTC (rev 104531)
@@ -40,7 +40,7 @@
         if b:
             break
         to = d
-    
+
     while path and path != to and path != '/':
         path, base = os.path.split(path)
         if base:
@@ -48,7 +48,7 @@
     if path != to:
         return None
     return os.path.join(*rel)
-    
+
 def source_release(args=None):
     if args is None:
         args = sys.argv[1:]
@@ -69,7 +69,7 @@
         name, value = arg.split('=', 1)
         section, option = name.split(':')
         clopts.append((section, option, value))
-    
+
     name = url.split('/')[-1]
 
     # use optparse to find custom filename
@@ -105,19 +105,19 @@
 
         buildout.bootstrap([])
 
-        args.extend([
+        buildargs = args[:]+[
             '-Uvc', os.path.join(co1, config),
             'buildout:download-cache='+cache
-            ])
+            ]
 
-        _system(os.path.join(co1, 'bin', 'buildout'), *args)
-        
+        _system(os.path.join(co1, 'bin', 'buildout'), *buildargs)
+
         os.chdir(here)
 
         env = pkg_resources.Environment([eggs_directory])
         dists = [env[project][0].location
                  for project in ('zc.buildout', 'setuptools')]
-                 
+
         eggs = os.path.join(co2, reggs)
         os.mkdir(eggs)
         for dist in dists:
@@ -135,10 +135,10 @@
                 config = config,
                 version = sys.version_info[:2],
                 eggs_directory = reggs,
-                args = repr(args)[1:-1],
+                args = args and repr(args)[1:-1]+',' or '',
             ))
 
-        
+
         tar = tarfile.open(name+'.tgz', 'w:gz')
         tar.add(co2, name)
         tar.close()
@@ -166,7 +166,7 @@
 
 import zc.buildout.buildout
 zc.buildout.buildout.main([
-    %(args)s,
+    %(args)s
     '-Uc', config,
     'buildout:download-cache='+os.path.join(here, 'release-distributions'),
     'buildout:install-from-cache=true',