[Checkins] SVN: zc.buildout/branches/gary-4/ the most basic change

Gary Poster gary.poster at canonical.com
Thu Dec 10 11:23:47 EST 2009


Log message for revision 106414:
  the most basic change

Changed:
  U   zc.buildout/branches/gary-4/src/zc/buildout/bootstrap.txt
  U   zc.buildout/branches/gary-4/src/zc/buildout/easy_install.py
  U   zc.buildout/branches/gary-4/src/zc/buildout/easy_install.txt
  U   zc.buildout/branches/gary-4/src/zc/buildout/update.txt
  U   zc.buildout/branches/gary-4/zc.recipe.egg_/src/zc/recipe/egg/README.txt

-=-
Modified: zc.buildout/branches/gary-4/src/zc/buildout/bootstrap.txt
===================================================================
--- zc.buildout/branches/gary-4/src/zc/buildout/bootstrap.txt	2009-12-10 16:23:46 UTC (rev 106413)
+++ zc.buildout/branches/gary-4/src/zc/buildout/bootstrap.txt	2009-12-10 16:23:46 UTC (rev 106414)
@@ -58,7 +58,6 @@
     ...
     X
     No local packages or download links found for zc.buildout==UNKNOWN...
-    error: Could not find suitable distribution for Requirement.parse('zc.buildout==UNKNOWN')
     ...
 
 Now let's try with `1.1.2`, which happens to exist::

Modified: zc.buildout/branches/gary-4/src/zc/buildout/easy_install.py
===================================================================
--- zc.buildout/branches/gary-4/src/zc/buildout/easy_install.py	2009-12-10 16:23:46 UTC (rev 106413)
+++ zc.buildout/branches/gary-4/src/zc/buildout/easy_install.py	2009-12-10 16:23:46 UTC (rev 106414)
@@ -1067,9 +1067,9 @@
     return generated
 
 if is_jython and jython_os_name == 'linux':
-    script_header = '#!/usr/bin/env %(python)s'
+    script_header = '#!/usr/bin/env %(python)s -S'
 else:
-    script_header = '#!%(python)s'
+    script_header = '#!%(python)s -S'
 
 
 script_template = script_header + '''\

Modified: zc.buildout/branches/gary-4/src/zc/buildout/easy_install.txt
===================================================================
--- zc.buildout/branches/gary-4/src/zc/buildout/easy_install.txt	2009-12-10 16:23:46 UTC (rev 106413)
+++ zc.buildout/branches/gary-4/src/zc/buildout/easy_install.txt	2009-12-10 16:23:46 UTC (rev 106414)
@@ -581,7 +581,7 @@
 The demo script run the entry point defined in the demo egg:
 
     >>> cat(bin, 'demo') # doctest: +NORMALIZE_WHITESPACE
-    #!/usr/local/bin/python2.4
+    #!/usr/local/bin/python2.4 -S
     <BLANKLINE>
     import sys
     sys.path[0:0] = [
@@ -618,7 +618,7 @@
     ...     ws, sys.executable, bin)
 
     >>> cat(bin, 'demo') # doctest: +NORMALIZE_WHITESPACE
-    #!/usr/local/bin/python2.4
+    #!/usr/local/bin/python2.4 -S
     <BLANKLINE>
     import sys
     sys.path[0:0] = [
@@ -662,7 +662,7 @@
 the path set:
 
     >>> cat(bin, 'py') # doctest: +NORMALIZE_WHITESPACE
-    #!/usr/local/bin/python2.4
+    #!/usr/local/bin/python2.4 -S
     <BLANKLINE>
     import sys
     <BLANKLINE>
@@ -748,7 +748,7 @@
     ...    extra_paths=[foo])
 
     >>> cat(bin, 'run') # doctest: +NORMALIZE_WHITESPACE
-    #!/usr/local/bin/python2.4
+    #!/usr/local/bin/python2.4 -S
     <BLANKLINE>
     import sys
     sys.path[0:0] = [
@@ -774,7 +774,7 @@
     ...    arguments='1, 2')
 
     >>> cat(bin, 'run') # doctest: +NORMALIZE_WHITESPACE
-    #!/usr/local/bin/python2.4
+    #!/usr/local/bin/python2.4 -S
     import sys
     sys.path[0:0] = [
       '/sample-install/demo-0.3-py2.4.egg',
@@ -797,7 +797,7 @@
     ...    initialization='import os\nos.chdir("foo")')
 
     >>> cat(bin, 'run') # doctest: +NORMALIZE_WHITESPACE
-    #!/usr/local/bin/python2.4
+    #!/usr/local/bin/python2.4 -S
     import sys
     sys.path[0:0] = [
       '/sample-install/demo-0.3-py2.4.egg',
@@ -837,7 +837,7 @@
     ...    relative_paths=bo)
 
     >>> cat(bo, 'bin', 'run')
-    #!/usr/local/bin/python2.4
+    #!/usr/local/bin/python2.4 -S
     <BLANKLINE>
     import os
     <BLANKLINE>
@@ -869,7 +869,7 @@
 We specified an interpreter and its paths are adjusted too:
 
     >>> cat(bo, 'bin', 'py')
-    #!/usr/local/bin/python2.4
+    #!/usr/local/bin/python2.4 -S
     <BLANKLINE>
     import os
     <BLANKLINE>

Modified: zc.buildout/branches/gary-4/src/zc/buildout/update.txt
===================================================================
--- zc.buildout/branches/gary-4/src/zc/buildout/update.txt	2009-12-10 16:23:46 UTC (rev 106413)
+++ zc.buildout/branches/gary-4/src/zc/buildout/update.txt	2009-12-10 16:23:46 UTC (rev 106414)
@@ -81,7 +81,7 @@
 Our buildout script has been updated to use the new eggs:
 
     >>> cat(sample_buildout, 'bin', 'buildout')
-    #!/usr/local/bin/python2.4
+    #!/usr/local/bin/python2.4 -S
     <BLANKLINE>
     import sys
     sys.path[0:0] = [

Modified: zc.buildout/branches/gary-4/zc.recipe.egg_/src/zc/recipe/egg/README.txt
===================================================================
--- zc.buildout/branches/gary-4/zc.recipe.egg_/src/zc/recipe/egg/README.txt	2009-12-10 16:23:46 UTC (rev 106413)
+++ zc.buildout/branches/gary-4/zc.recipe.egg_/src/zc/recipe/egg/README.txt	2009-12-10 16:23:46 UTC (rev 106414)
@@ -373,7 +373,7 @@
 Let's look at the script that was generated:
 
     >>> cat(sample_buildout, 'bin', 'foo') # doctest: +NORMALIZE_WHITESPACE
-    #!/usr/local/bin/python2.4
+    #!/usr/local/bin/python2.4 -S
     <BLANKLINE>
     import sys
     sys.path[0:0] = [
@@ -420,7 +420,7 @@
 Let's look at the script that was generated:
 
     >>> cat(sample_buildout, 'bin', 'foo') # doctest: +NORMALIZE_WHITESPACE
-    #!/usr/local/bin/python2.4
+    #!/usr/local/bin/python2.4 -S
     <BLANKLINE>
     import os
     <BLANKLINE>
@@ -467,7 +467,7 @@
     Generated script '/sample-buildout/bin/foo'.
 
     >>> cat(sample_buildout, 'bin', 'foo') # doctest: +NORMALIZE_WHITESPACE
-    #!/usr/local/bin/python2.4
+    #!/usr/local/bin/python2.4 -S
     <BLANKLINE>
     import os
     <BLANKLINE>
@@ -520,7 +520,7 @@
     Generated script '/sample-buildout/bin/foo'.
 
     >>> cat(sample_buildout, 'bin', 'foo') # doctest: +NORMALIZE_WHITESPACE
-    #!/usr/local/bin/python2.4
+    #!/usr/local/bin/python2.4 -S
     <BLANKLINE>
     import sys
     sys.path[0:0] = [
@@ -578,7 +578,7 @@
     -  other
 
     >>> cat(sample_buildout, 'bin', 'other')
-    #!/usr/local/bin/python2.4
+    #!/usr/local/bin/python2.4 -S
     <BLANKLINE>
     import sys
     sys.path[0:0] = [



More information about the checkins mailing list