[Pkg-bazaar-commits] ./bzr/unstable r624: - make sure bzr is always explicitly invoked through

[Martin Pool]

------------------------------------------------------------
revno: 624
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-06-06 15:13:21 +1000
message:
  - make sure bzr is always explicitly invoked through 
    python in case it's not executable
modified:
  testbzr
-------------- next part --------------
=== modified file 'testbzr'
--- a/testbzr	2005-06-06 04:47:33 +0000
+++ b/testbzr	2005-06-06 05:13:21 +0000
@@ -46,7 +46,10 @@
 
 TESTDIR = "testbzr.tmp"
 
-OVERRIDE_PYTHON = None
+
+# we always invoke bzr as 'python bzr' (or e.g. 'python2.3 bzr')
+# partly so as to cope if the bzr binary is not marked executable
+OVERRIDE_PYTHON = 'python'
 
 LOGFILENAME = 'testbzr.log'
 
@@ -166,7 +169,7 @@
     print '%-30s %s' % ('in directory', os.getcwd())
     print '%-30s %s' % ('with python', (OVERRIDE_PYTHON or '(default)'))
     print
-    print backtick([BZRPATH, 'version'])
+    print backtick('bzr version')
     
     runcmd(['mkdir', TESTDIR])
     cd(TESTDIR)