summaryrefslogtreecommitdiff
path: root/morphlib/app.py
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@codethink.co.uk>2014-08-12 17:59:14 +0100
committerRichard Maw <richard.maw@codethink.co.uk>2014-08-12 18:01:57 +0100
commit6241d4466599406e3ad0a176c70fcbecdfdd1b64 (patch)
tree1315974add9e092dfd58d270125c1d9b066d22a6 /morphlib/app.py
parent1a6fb660b94228745efc4543138b9dc1fa50e912 (diff)
parenta74e2caafbeb49a49f542514590f720f6b215a6d (diff)
downloadmorph-6241d4466599406e3ad0a176c70fcbecdfdd1b64.tar.gz
Merge remote-tracking branch 'origin/baserock/richardmaw/S11416/no-unnecessary-temp-branches'
Reviewed-by: Daniel Silverstone
Diffstat (limited to 'morphlib/app.py')
-rw-r--r--morphlib/app.py5
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: