diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2014-07-11 14:25:40 +0100 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2014-07-11 14:25:40 +0100 |
| commit | ce1fedb4e5ab82105853c4f3a8e05fb83f62c18e (patch) | |
| tree | 6a738f64b517992eed10c3d5891bbb27840202e4 /morphlib/sysbranchdir.py | |
| parent | fe4486c1ec69c520a2c0aee7b52c35b57808120e (diff) | |
| parent | 597f2a19363b7e91b928d814627c9236779998fb (diff) | |
| download | morph-ce1fedb4e5ab82105853c4f3a8e05fb83f62c18e.tar.gz | |
Merge remote-tracking branch 'origin/baserock/richardmaw/S11284/morphologies-by-path-v4'
Reviewed-by: Sam Thursfield
Reviewed-by: Lars Wirzenius
Diffstat (limited to 'morphlib/sysbranchdir.py')
| -rw-r--r-- | morphlib/sysbranchdir.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/morphlib/sysbranchdir.py b/morphlib/sysbranchdir.py index 9d96e974..b8953c2f 100644 --- a/morphlib/sysbranchdir.py +++ b/morphlib/sysbranchdir.py @@ -176,8 +176,9 @@ class SystemBranchDirectory(object): gd_name = self.get_git_directory_name(self.root_repository_url) gd = morphlib.gitdir.GitDirectory(gd_name) mf = morphlib.morphologyfinder.MorphologyFinder(gd) - for morph in mf.list_morphologies(): - text, filename = mf.read_morphology(morph) + for filename in (f for f in mf.list_morphologies() + if not gd.is_symlink(f)): + text = mf.read_morphology(filename) m = loader.load_from_string(text, filename=filename) m.repo_url = self.root_repository_url m.ref = self.system_branch_name |