* [PATCH] Catch more exceptions in compat_log_entry()
@ 2013-10-22 14:31 Pavel Roskin
2013-11-06 10:27 ` Catalin Marinas
0 siblings, 1 reply; 2+ messages in thread
From: Pavel Roskin @ 2013-10-22 14:31 UTC (permalink / raw)
To: git, Catalin Marinas
Catch exceptions in default_repo(). Catch git.RepositoryException.
This suppresses stack trace in "stg pull" on detached head and outside
the repository.
Signed-off-by: Pavel Roskin <proski@gnu.org>
---
stgit/lib/log.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/stgit/lib/log.py b/stgit/lib/log.py
index dfadd51..d876ff6 100644
--- a/stgit/lib/log.py
+++ b/stgit/lib/log.py
@@ -359,10 +359,10 @@ class Fakestack(object):
def compat_log_entry(msg):
"""Write a new log entry. (Convenience function intended for use by
code not yet converted to the new infrastructure.)"""
- repo = default_repo()
try:
+ repo = default_repo()
stack = repo.get_stack(repo.current_branch_name)
- except libstack.StackException, e:
+ except (libstack.StackException, git.RepositoryException), e:
out.warn(str(e), 'Could not write to stack log')
else:
if repo.default_index.conflicts() and stack.patchorder.applied:
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-11-06 10:28 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-10-22 14:31 [PATCH] Catch more exceptions in compat_log_entry() Pavel Roskin
2013-11-06 10:27 ` Catalin Marinas
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).