Mercurial > gub
changeset 4471:eb03a77d8e77
Partial pdb [run installed gub] fix.
| author | Jan Nieuwenhuizen <janneke@gnu.org> |
|---|---|
| date | Fri, 24 Oct 2008 12:20:38 +0200 |
| parents | 58b66d99c122 |
| children | 201a70400242 |
| files | bin/gub gub/cross.py |
| diffstat | 2 files changed, 11 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/bin/gub Fri Oct 24 12:20:10 2008 +0200 +++ b/bin/gub Fri Oct 24 12:20:38 2008 +0200 @@ -24,6 +24,8 @@ import os, sys bindir = os.path.dirname (sys.argv[0]) prefix = os.path.dirname (bindir) + if not prefix: + prefix = '../' sys.path.insert (0, prefix) argv0_relocation () @@ -254,6 +256,12 @@ def main (): + # FIXME: pydb hack. TODO: make gub run not from srcdir + bindir = os.path.dirname (sys.argv[0]) + gubdir = os.path.dirname (bindir) + if gubdir: + os.chdir (gubdir) + cli_parser = get_cli_parser () (options, files) = cli_parser.parse_args () options.verbosity -= options.quiet
--- a/gub/cross.py Fri Oct 24 12:20:10 2008 +0200 +++ b/gub/cross.py Fri Oct 24 12:20:38 2008 +0200 @@ -65,12 +65,13 @@ return cross_module_cache[platform] base = re.sub ('[-0-9].*', '', platform) + gubdir = settings.gubdir for name in platform, base: - file_name = 'gub/%(name)s.py' % locals () + file_name = '%(gubdir)s/gub/%(name)s.py' % locals () if os.path.exists (file_name): break - logging.info ('module-name: ' + file_name + '\n') + logging.info ('module name: ' + name + '\n') module = misc.load_module (file_name, base) cross_module_checksums[platform] = md5.md5 (open (file_name).read ()).hexdigest ()