Merge lp:~zyga/checkbox/fix-1443895 into lp:checkbox

Proposed by Zygmunt Krynicki
Status: Merged
Approved by: Maciej Kisielewski
Approved revision: 3684
Merged at revision: 3686
Proposed branch: lp:~zyga/checkbox/fix-1443895
Merge into: lp:checkbox
Diff against target: 26 lines (+7/-1)
1 file modified
checkbox-ng/checkbox_ng/tools.py (+7/-1)
To merge this branch: bzr merge lp:~zyga/checkbox/fix-1443895
Reviewer Review Type Date Requested Status
Maciej Kisielewski Approve
Review via email: mp+256155@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Maciej Kisielewski (kissiel) wrote :

LGTM, +1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'checkbox-ng/checkbox_ng/tools.py'
--- checkbox-ng/checkbox_ng/tools.py 2014-12-12 12:04:55 +0000
+++ checkbox-ng/checkbox_ng/tools.py 2015-04-14 14:20:49 +0000
@@ -26,6 +26,7 @@
2626
27from plainbox.impl.clitools import SingleCommandToolMixIn27from plainbox.impl.clitools import SingleCommandToolMixIn
28from plainbox.impl.clitools import ToolBase28from plainbox.impl.clitools import ToolBase
29from plainbox.impl.providers import special
29from plainbox.impl.providers.v1 import all_providers30from plainbox.impl.providers.v1 import all_providers
30from plainbox.impl.commands.cmd_selftest import SelfTestCommand31from plainbox.impl.commands.cmd_selftest import SelfTestCommand
3132
@@ -49,8 +50,13 @@
49 return self.get_config_cls().get()50 return self.get_config_cls().get()
5051
51 def _load_providers(self):52 def _load_providers(self):
53 # Load all normal providers
52 all_providers.load()54 all_providers.load()
53 return all_providers.get_all_plugin_objects()55 return [
56 special.get_manifest(),
57 # NOTE: currently disabled as it was not added implicitly earlier
58 # special.get_categories(),
59 ] + all_providers.get_all_plugin_objects()
5460
55 @classmethod61 @classmethod
56 def get_exec_version(cls):62 def get_exec_version(cls):

Subscribers

People subscribed via source and target branches