diff options
| author | W. Trevor King <wking@drexel.edu> | 2011-02-22 21:02:11 -0500 |
|---|---|---|
| committer | W. Trevor King <wking@drexel.edu> | 2011-02-22 21:02:11 -0500 |
| commit | 893bbc21bdac3a5f25c17e547df8adab00dbd670 (patch) | |
| tree | e3ff8ea586da98cc08776110802db11883c63dca /libbe/storage/vcs/monotone.py | |
| parent | 2e32d6fc84d3b211b57a8c39a47b28b991b3ea32 (diff) | |
| download | bugseverywhere-893bbc21bdac3a5f25c17e547df8adab00dbd670.tar.gz | |
Local imports and better missing-client detection in client-based VCS classes.
Diffstat (limited to 'libbe/storage/vcs/monotone.py')
| -rw-r--r-- | libbe/storage/vcs/monotone.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/libbe/storage/vcs/monotone.py b/libbe/storage/vcs/monotone.py index 65ecd91..e99a6ec 100644 --- a/libbe/storage/vcs/monotone.py +++ b/libbe/storage/vcs/monotone.py @@ -29,8 +29,8 @@ import unittest import libbe import libbe.ui.util.user -from libbe.util.subproc import CommandError -import base +from ...util.subproc import CommandError +from . import base if libbe.TESTING == True: import doctest @@ -54,7 +54,10 @@ class Monotone (base.VCS): self._key = None def _vcs_version(self): - status,output,error = self._u_invoke_client('automate', 'interface_version') + try: + status,output,error = self._u_invoke_client('automate', 'interface_version') + except CommandError: # command not found? + return None return output.strip() def version_cmp(self, *args): |