Commit 5bf3d38f authored by Matthias Putz's avatar Matthias Putz

fix debugging unix

parent 678b319d
...@@ -482,19 +482,21 @@ def _Main(argv): ...@@ -482,19 +482,21 @@ def _Main(argv):
repo = _Repo(opt.repodir) repo = _Repo(opt.repodir)
repo._Config(argv) repo._Config(argv)
gopts = repo.config[2]
if gopts.debug:
if portable.isPosix():
# deactivate pager on posix systems since forked process cant be debugged
os.environ['GIT_PAGER'] = ''
# intercept here if on Windows and Pager is required # intercept here if on Windows and Pager is required
if not portable.isPosix(): if not portable.isPosix():
if _WindowsPager(repo): if _WindowsPager(repo):
# everything was already done; so exit # everything was already done; so exit
return 0 return 0
gopts = repo.config[2]
if gopts.debug: if gopts.debug:
print("enter debug mode, host %s" % gopts.debug_host) print("enter debug mode, host %s" % gopts.debug_host)
_Debug(gopts.debug_host, gopts.debug_env) _Debug(gopts.debug_host, gopts.debug_env)
if portable.isPosix():
# deactivate pager on posix systems since forked process cant be debugged
os.environ['GIT_PAGER'] = ''
try: try:
try: try:
...@@ -518,7 +520,7 @@ def _Main(argv): ...@@ -518,7 +520,7 @@ def _Main(argv):
argv.insert(0, __file__) argv.insert(0, __file__)
subprocess.call(argv) subprocess.call(argv)
except OSError as e: except OSError as e:
print('fatal: cannot restart repo after upgrade (command %s)' % argv, file=sys.stderr) print('fatal: cannot restart repo after upgrade', file=sys.stderr)
print('fatal: %s' % e, file=sys.stderr) print('fatal: %s' % e, file=sys.stderr)
result = 128 result = 128
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment