Commit ab057085 authored by jim's avatar jim

- 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.


git-svn-id: http://svn.zope.org/repos/main/zc.buildout/trunk@101225 62d5b8a3-27da-0310-9561-8e5933582275
parent 68fe7a00
Change History Change History
************** **************
1.2.2 (2009-06-19) 1.3.0 (2009-06-22)
================== ==================
- Better Windows compatibility in test infrastructure. - Better Windows compatibility in test infrastructure.
...@@ -18,6 +18,9 @@ Change History ...@@ -18,6 +18,9 @@ Change History
- Added an unload entry point for extensions. - 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) 1.2.1 (2009-03-18)
================== ==================
......
...@@ -1023,7 +1023,7 @@ relative_paths_setup = """ ...@@ -1023,7 +1023,7 @@ relative_paths_setup = """
import os import os
join = os.path.join 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, def _script(module_name, attrs, path, dest, executable, arguments,
......
...@@ -817,7 +817,7 @@ to pass a common base directory of the scripts and eggs: ...@@ -817,7 +817,7 @@ to pass a common base directory of the scripts and eggs:
import os import os
<BLANKLINE> <BLANKLINE>
join = os.path.join join = os.path.join
base = os.path.dirname(__file__) base = os.path.dirname(os.path.abspath(__file__))
base = os.path.dirname(base) base = os.path.dirname(base)
<BLANKLINE> <BLANKLINE>
import sys import sys
...@@ -849,7 +849,7 @@ We specified an interpreter and its paths are adjusted too: ...@@ -849,7 +849,7 @@ We specified an interpreter and its paths are adjusted too:
import os import os
<BLANKLINE> <BLANKLINE>
join = os.path.join join = os.path.join
base = os.path.dirname(__file__) base = os.path.dirname(os.path.abspath(__file__))
base = os.path.dirname(base) base = os.path.dirname(base)
<BLANKLINE> <BLANKLINE>
import sys import sys
......
...@@ -425,7 +425,7 @@ Let's look at the script that was generated: ...@@ -425,7 +425,7 @@ Let's look at the script that was generated:
import os import os
<BLANKLINE> <BLANKLINE>
join = os.path.join join = os.path.join
base = os.path.dirname(__file__) base = os.path.dirname(os.path.abspath(__file__))
base = os.path.dirname(base) base = os.path.dirname(base)
<BLANKLINE> <BLANKLINE>
import sys import sys
...@@ -472,7 +472,7 @@ each individual script section: ...@@ -472,7 +472,7 @@ each individual script section:
import os import os
<BLANKLINE> <BLANKLINE>
join = os.path.join join = os.path.join
base = os.path.dirname(__file__) base = os.path.dirname(os.path.abspath(__file__))
base = os.path.dirname(base) base = os.path.dirname(base)
<BLANKLINE> <BLANKLINE>
import sys import sys
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment