From: david-sarah Date: Wed, 19 Jan 2011 04:53:24 +0000 (-0800) Subject: bin/tahoe-script.template, src/windows/fixups.py: simplify the method of stripping... X-Git-Tag: allmydata-tahoe-1.8.2b1~40 X-Git-Url: https://git.rkrishnan.org/components/com_hotproperty/simplejson/%5B%5E?a=commitdiff_plain;h=93c1909847e9dc441177b7d0d78def3b75ae149c;p=tahoe-lafs%2Ftahoe-lafs.git bin/tahoe-script.template, src/windows/fixups.py: simplify the method of stripping initial arguments in sys.argv on Windows. This helps with bb-freeze and running tahoe via 'coverage'. Also includes some wording changes and minor refactoring of bin/tahoe-script.template. refs #585, #1303 --- diff --git a/bin/tahoe-script.template b/bin/tahoe-script.template index 1a227319..10c8a006 100644 --- a/bin/tahoe-script.template +++ b/bin/tahoe-script.template @@ -1,7 +1,7 @@ #!/bin/false # You must specify a python interpreter. u"Tahoe-LAFS does not run under Python 3. Please use a version of Python between 2.4.4 and 2.7.x inclusive." -import errno, sys, os, subprocess +import sys, os, subprocess where = os.path.realpath(sys.argv[0]) base = os.path.dirname(os.path.dirname(where)) @@ -14,8 +14,8 @@ else: whoami = '''\ I am a "bin%stahoe" executable who is only for the convenience of running Tahoe from its source distribution -- I work only when invoked as the "tahoe" -script that lives in the "bin/" subdirectory of a Tahoe source code -distribution, and only if you have already run "make". +script that lives in the "bin" subdirectory of a Tahoe source code +distribution, and only if you have already run "python setup.py build". ''' % (os.path.sep,) # look for Tahoe.home . @@ -65,39 +65,40 @@ if sys.platform == "win32": def mangle(s): return str(re.sub(ur'[^\x20-\x7F]', lambda m: u'\x7F%x;' % (ord(m.group(0)),), s)) - argv = [mangle(argv_unicode[i]) for i in xrange(1, argc.value)] + argv = [mangle(argv_unicode[i]) for i in xrange(0, argc.value)] - # Skip option arguments to the Python interpreter. - while len(argv) > 0: - arg = argv[0] - if not arg.startswith(u"-") or arg == u"-": - break - argv = argv[1:] - if arg == u'-m' or arg == u'-c': - break + # Take only the suffix with the same number of arguments as sys.argv. + # This accounts for anything that can cause initial arguments to be stripped, + # for example, the Python interpreter or any options passed to it, or runner + # scripts such as 'coverage run'. It works even if there are no such arguments, + # as in the case of a frozen executable created by bb-freeze or similar. - script = os.path.join(base, "support", "Scripts", "tahoe.pyscript") + argv = argv[-len(sys.argv):] # On Windows, the script is not directly executable and must be run via python. - args = [sys.executable, script] + argv[1:] + prefix = [sys.executable] + script = os.path.join(base, "support", "Scripts", "tahoe.pyscript") + args = argv[1:] else: - script = os.path.join(base, "support", "bin", "tahoe") - # On non-Windows, invoke the script directly, so that 'top' for example shows 'tahoe'. - args = [script] + sys.argv[1:] + prefix = [] + script = os.path.join(base, "support", "bin", "tahoe") + args = sys.argv[1:] -try: - res = subprocess.call(args, env=os.environ) -except (OSError, IOError), le: - if le.args[0] == errno.ENOENT: - print whoami - print '''\ +if not os.path.exists(script): + print whoami + print '''\ I just tried to run and could not find my brother at "%s". To run Tahoe when it is installed, please execute my brother, who gets installed into the appropriate place for executables -when you run "make install" (perhaps as "%s"). +when you run "python setup.py install" (perhaps as "%s"). ''' % (script, perhaps_installed_tahoe) - raise + sys.exit(1) + +command = prefix + [script] + args + +try: + res = subprocess.call(command, env=os.environ) except Exception, le: print whoami print '''\ @@ -107,4 +108,3 @@ and got an exception. raise else: sys.exit(res) - diff --git a/src/allmydata/windows/fixups.py b/src/allmydata/windows/fixups.py index 12c725bc..35e048b7 100644 --- a/src/allmydata/windows/fixups.py +++ b/src/allmydata/windows/fixups.py @@ -177,25 +177,18 @@ def initialize(): return re.sub(ur'\x7F[0-9a-fA-F]*\;', lambda m: unichr(int(m.group(0)[1:-1], 16)), s) try: - argv = [unmangle(argv_unicode[i]).encode('utf-8') for i in xrange(1, argc.value)] + argv = [unmangle(argv_unicode[i]).encode('utf-8') for i in xrange(0, argc.value)] except Exception, e: _complain("%s: could not unmangle Unicode arguments.\n%r" - % (sys.argv[0], [argv_unicode[i] for i in xrange(1, argc.value)])) + % (sys.argv[0], [argv_unicode[i] for i in xrange(0, argc.value)])) raise - # Skip option arguments to the Python interpreter. - while len(argv) > 0: - arg = argv[0] - if not arg.startswith(u"-") or arg == u"-": - if arg.endswith('.pyscript'): - argv[0] = arg[:-9] - break - argv = argv[1:] - if arg == u'-m': - # sys.argv[0] should really be the absolute path of the module source, but never mind - break - if arg == u'-c': - argv[0] = u'-c' - break - - sys.argv = argv + # Take only the suffix with the same number of arguments as sys.argv. + # This accounts for anything that can cause initial arguments to be stripped, + # for example, the Python interpreter or any options passed to it, or runner + # scripts such as 'coverage run'. It works even if there are no such arguments, + # as in the case of a frozen executable created by bb-freeze or similar. + + sys.argv = argv[-len(sys.argv):] + if sys.argv[0].endswith('.pyscript'): + sys.argv[0] = sys.argv[0][:-9]