diff options
| author | Tiago Gomes <tiago.gomes@codethink.co.uk> | 2015-11-23 17:07:24 +0000 |
|---|---|---|
| committer | Tiago Gomes <tiago.gomes@codethink.co.uk> | 2015-11-25 14:29:09 +0000 |
| commit | 13fa0d15645e2d21c9c41d1f6c481233e24a8cfd (patch) | |
| tree | 93e3c93f35fe56c1c355c417ef022f48e7a77bf9 /morphlib/extensions.py | |
| parent | 25617bd6277e2ec44c8d6acd742280a2708a6a2c (diff) | |
| download | morph-13fa0d15645e2d21c9c41d1f6c481233e24a8cfd.tar.gz | |
Prepare the removal of workspace and system branches code
Change-Id: Id470c7a77a47c89118a5d9d0d23b2206d8a839e4
Diffstat (limited to 'morphlib/extensions.py')
| -rw-r--r-- | morphlib/extensions.py | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/morphlib/extensions.py b/morphlib/extensions.py index b2a015b1..7290f7c1 100644 --- a/morphlib/extensions.py +++ b/morphlib/extensions.py @@ -24,7 +24,6 @@ import tempfile import cliapp import morphlib -import sysbranchdir class ExtensionError(morphlib.Error): @@ -67,12 +66,10 @@ def _list_extensions(kind): repo_extension_filenames = [] try: definitions_repo = morphlib.definitions_repo.open( - '.', search_for_root=True, search_workspace=True) + '.', search_for_root=True) repo_extension_filenames = \ _list_repo_extension_filenames(definitions_repo, kind) - except (morphlib.workspace.NotInWorkspace, - sysbranchdir.NotInSystemBranch, - morphlib.definitions_repo.DefinitionsRepoNotFound): + except morphlib.definitions_repo.DefinitionsRepoNotFound: # Squash this and just return no system branch extensions pass morph_extension_filenames = _list_morph_extension_filenames(kind) @@ -129,7 +126,7 @@ class get_extension_filename(): try: ext_contents = _get_repo_extension_contents( self.definitions_repo, self.name, self.kind) - except (IOError, cliapp.AppException, sysbranchdir.NotInSystemBranch): + except (IOError, cliapp.AppException): # Not found: look for it in the Morph code. ext_filename = _get_morph_extension_filename(self.name, self.kind) if not os.path.exists(ext_filename): |