[Checkins] SVN: zc.buildout/branches/gary-support-system-python/src/zc/buildout/ spelling fix, and a fix for the fix. Did not run tests for these past few commits, so now may be hosed. Trying to verify.

Gary Poster gary.poster at canonical.com
Thu Jul 16 16:49:39 EDT 2009


Log message for revision 101952:
  spelling fix, and a fix for the fix.  Did not run tests for these past few commits, so now may be hosed.  Trying to verify.

Changed:
  U   zc.buildout/branches/gary-support-system-python/src/zc/buildout/buildout.py
  U   zc.buildout/branches/gary-support-system-python/src/zc/buildout/setup.txt

-=-
Modified: zc.buildout/branches/gary-support-system-python/src/zc/buildout/buildout.py
===================================================================
--- zc.buildout/branches/gary-support-system-python/src/zc/buildout/buildout.py	2009-07-16 20:26:30 UTC (rev 101951)
+++ zc.buildout/branches/gary-support-system-python/src/zc/buildout/buildout.py	2009-07-16 20:49:38 UTC (rev 101952)
@@ -874,7 +874,7 @@
         if not args:
             raise zc.buildout.UserError(
                 "The setup command requires the path to a setup script or \n"
-                "directory containing a setup script, and it's arguments."
+                "directory containing a setup script, and its arguments."
                 )
         setup = args.pop(0)
         if os.path.isdir(setup):
@@ -886,7 +886,7 @@
         fd, tsetup = tempfile.mkstemp()
         try:
             os.write(fd, zc.buildout.easy_install.runsetup_template % dict(
-                setuptools=pkg_resources_loc,
+                sys_path=',\n    '.join(repr(p) for p in sys.path),
                 setupdir=os.path.dirname(setup),
                 setup=setup,
                 __file__ = setup,

Modified: zc.buildout/branches/gary-support-system-python/src/zc/buildout/setup.txt
===================================================================
--- zc.buildout/branches/gary-support-system-python/src/zc/buildout/setup.txt	2009-07-16 20:26:30 UTC (rev 101951)
+++ zc.buildout/branches/gary-support-system-python/src/zc/buildout/setup.txt	2009-07-16 20:49:38 UTC (rev 101952)
@@ -30,7 +30,7 @@
 
     >>> print system(buildout+' setup'),
     Error: The setup command requires the path to a setup script or 
-    directory containing a setup script, and it's arguments.
+    directory containing a setup script, and its arguments.
 
 Oops, we forgot to give the name of the setup script:
 



More information about the Checkins mailing list