[Checkins] SVN: zc.buildout/trunk/ - Fixed bug: when the relative paths option was used, relative paths

Jim Fulton jim at zope.com
Mon Jun 22 13:41:40 EDT 2009


Log message for revision 101225:
  - Fixed bug: when the relative paths option was used, relative paths
    could be inserted into sys.path if a relative path was used to run
    the generated script.
  

Changed:
  U   zc.buildout/trunk/CHANGES.txt
  U   zc.buildout/trunk/src/zc/buildout/easy_install.py
  U   zc.buildout/trunk/src/zc/buildout/easy_install.txt
  U   zc.buildout/trunk/zc.recipe.egg_/src/zc/recipe/egg/README.txt

-=-
Modified: zc.buildout/trunk/CHANGES.txt
===================================================================
--- zc.buildout/trunk/CHANGES.txt	2009-06-22 17:16:35 UTC (rev 101224)
+++ zc.buildout/trunk/CHANGES.txt	2009-06-22 17:41:40 UTC (rev 101225)
@@ -1,7 +1,7 @@
 Change History
 **************
 
-1.2.2 (2009-06-19)
+1.3.0 (2009-06-22)
 ==================
 
 - Better Windows compatibility in test infrastructure.
@@ -18,6 +18,9 @@
 
 - Added an unload entry point for extensions.
 
+- Fixed bug: when the relative paths option was used, relative paths
+  could be inserted into sys.path if a relative path was used to run
+  the generated script.
 
 1.2.1 (2009-03-18)
 ==================

Modified: zc.buildout/trunk/src/zc/buildout/easy_install.py
===================================================================
--- zc.buildout/trunk/src/zc/buildout/easy_install.py	2009-06-22 17:16:35 UTC (rev 101224)
+++ zc.buildout/trunk/src/zc/buildout/easy_install.py	2009-06-22 17:41:40 UTC (rev 101225)
@@ -1023,7 +1023,7 @@
 import os
 
 join = os.path.join
-base = os.path.dirname(__file__)
+base = os.path.dirname(os.path.abspath(__file__))
 """
 
 def _script(module_name, attrs, path, dest, executable, arguments,

Modified: zc.buildout/trunk/src/zc/buildout/easy_install.txt
===================================================================
--- zc.buildout/trunk/src/zc/buildout/easy_install.txt	2009-06-22 17:16:35 UTC (rev 101224)
+++ zc.buildout/trunk/src/zc/buildout/easy_install.txt	2009-06-22 17:41:40 UTC (rev 101225)
@@ -817,7 +817,7 @@
     import os
     <BLANKLINE>
     join = os.path.join
-    base = os.path.dirname(__file__)
+    base = os.path.dirname(os.path.abspath(__file__))
     base = os.path.dirname(base)
     <BLANKLINE>
     import sys
@@ -849,7 +849,7 @@
     import os
     <BLANKLINE>
     join = os.path.join
-    base = os.path.dirname(__file__)
+    base = os.path.dirname(os.path.abspath(__file__))
     base = os.path.dirname(base)
     <BLANKLINE>
     import sys

Modified: zc.buildout/trunk/zc.recipe.egg_/src/zc/recipe/egg/README.txt
===================================================================
--- zc.buildout/trunk/zc.recipe.egg_/src/zc/recipe/egg/README.txt	2009-06-22 17:16:35 UTC (rev 101224)
+++ zc.buildout/trunk/zc.recipe.egg_/src/zc/recipe/egg/README.txt	2009-06-22 17:41:40 UTC (rev 101225)
@@ -425,7 +425,7 @@
     import os
     <BLANKLINE>
     join = os.path.join
-    base = os.path.dirname(__file__)
+    base = os.path.dirname(os.path.abspath(__file__))
     base = os.path.dirname(base)
     <BLANKLINE>
     import sys
@@ -472,7 +472,7 @@
     import os
     <BLANKLINE>
     join = os.path.join
-    base = os.path.dirname(__file__)
+    base = os.path.dirname(os.path.abspath(__file__))
     base = os.path.dirname(base)
     <BLANKLINE>
     import sys



More information about the Checkins mailing list