diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2014-08-08 23:05:11 +0100 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2014-08-12 11:00:09 +0100 |
| commit | 4f14465e968be2ff479ddfeaa6eb568881287bed (patch) | |
| tree | 56ba534b914c9f0312467ba3ac0292bcaa7a771c /morphlib/app.py | |
| parent | 1aaa11a10d03202063e15b6dd0a3b5217de51fc2 (diff) | |
| download | morph-4f14465e968be2ff479ddfeaa6eb568881287bed.tar.gz | |
Cut BuildBranch out of morphlib.extensions
This was previously used just so it could get the right repo and ref to
read the file out of.
However, there was a subtle bug in this behaviour, as if we had not
previously used morph build in that branch, it would attempt to read the
extensions from a branch which didn't exist.
So now it reads it from the working tree, which always exists.
Diffstat (limited to 'morphlib/app.py')
| -rw-r--r-- | morphlib/app.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/morphlib/app.py b/morphlib/app.py index a543443e..88eb58a4 100644 --- a/morphlib/app.py +++ b/morphlib/app.py @@ -518,16 +518,15 @@ class Morph(cliapp.Application): self.output.write(text) def _help_topic(self, topic): - build_ref_prefix = self.settings['build-ref-prefix'] if topic in self.subcommands: usage = self._format_usage_for(topic) description = self._format_subcommand_help(topic) text = '%s\n\n%s' % (usage, description) self.output.write(text) - elif topic in extensions.list_extensions(build_ref_prefix): + elif topic in extensions.list_extensions(): name, kind = os.path.splitext(topic) try: - with extensions.get_extension_filename(build_ref_prefix, + with extensions.get_extension_filename( name, kind + '.help', executable=False) as fname: with open(fname, 'r') as f: |