Merge admin-scripts-path-6208

Author: therve Reviewer: tom.prince Fixes: twisted#6208 Make sure admin scripts use the current checkout when running. git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@37076 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
fladi · Feb 9, 2013 · 69d8955 · 69d8955
1 parent 5e7514f
commit 69d8955
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 4 deletions.
diff --git a/bin/admin/build-apidocs b/bin/admin/build-apidocs
@@ -6,7 +6,14 @@
 # This script is not meant to be distributed to users of Twisted.
 # It is only for use in making upstream Twisted releases.
 
-import sys
+import sys, os
+extra = os.path.dirname(os.path.dirname(sys.argv[0]))
+sys.path.insert(0, extra)
+try:
+    import _preamble
+except ImportError:
+    sys.exc_clear()
+sys.path.remove(extra)
 
 from twisted.python._release import BuildAPIDocsScript
 

diff --git a/bin/admin/build-news b/bin/admin/build-news
@@ -6,7 +6,14 @@
 # This script is not meant to be distributed to users of Twisted.
 # It is only for use in making upstream Twisted releases.
 
-import sys
+import sys, os
+extra = os.path.dirname(os.path.dirname(sys.argv[0]))
+sys.path.insert(0, extra)
+try:
+    import _preamble
+except ImportError:
+    sys.exc_clear()
+sys.path.remove(extra)
 
 from twisted.python._release import NewsBuilder
 

diff --git a/bin/admin/build-tarballs b/bin/admin/build-tarballs
@@ -6,7 +6,14 @@
 # This script is not meant to be distributed to users of Twisted.
 # It is only for use in making upstream Twisted releases.
 
-import sys
+import sys, os
+extra = os.path.dirname(os.path.dirname(sys.argv[0]))
+sys.path.insert(0, extra)
+try:
+    import _preamble
+except ImportError:
+    sys.exc_clear()
+sys.path.remove(extra)
 
 from twisted.python._release import BuildTarballsScript
 

diff --git a/bin/admin/change-versions b/bin/admin/change-versions
@@ -6,7 +6,14 @@
 # This script is not meant to be distributed to users of Twisted.
 # It is only for use in making upstream Twisted releases.
 
-import sys
+import sys, os
+extra = os.path.dirname(os.path.dirname(sys.argv[0]))
+sys.path.insert(0, extra)
+try:
+    import _preamble
+except ImportError:
+    sys.exc_clear()
+sys.path.remove(extra)
 
 from twisted.python._release import ChangeVersionsScript
 

diff --git a/twisted/topfiles/6208.misc b/twisted/topfiles/6208.misc