Merge branch 'options-unit-tests' of https://github.com/stpierre/bcfg2

* 'options-unit-tests' of https://github.com/stpierre/bcfg2:
  Options: Fixed non-path database name parsing
  Options: further command registry fixes
  Options: gather as much data from config file first
  Options: fix path canonicalization and file-like objects
  testsuite: unlink temporary files
  Options: ensure <repository> macros are always fixed up
  DBSettings: fix up <repository> in database name
  testsuite: better debug capturing for options tests
  call shutdown on subcommand registries
  fixed some places where plugin loading should fail silently
  testsuite: Added unit tests for new option parsing
  testsuite: capture stderr by default
  Test failure to parse config file when bcfg2.conf exists
  testsuite: skip nested exclusive option group test on py2.6
  testsuite: Added unit tests for new option parsing

1 files changed, 2 insertions, 2 deletions

diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/YumHelper.py b/src/lib/Bcfg2/Server/Plugins/Packages/YumHelper.py
index 48304d26e..f26d6ba18 100644
--- a/src/lib/Bcfg2/Server/Plugins/Packages/YumHelper.py
+++ b/src/lib/Bcfg2/Server/Plugins/Packages/YumHelper.py
@@ -383,10 +383,10 @@ class CLI(Bcfg2.Options.CommandRegistry):
 
     def __init__(self):
         Bcfg2.Options.CommandRegistry.__init__(self)
-        Bcfg2.Options.register_commands(self.__class__, globals().values(),
-                                        parent=HelperSubcommand)
+        self.register_commands(globals().values(), parent=HelperSubcommand)
         parser = Bcfg2.Options.get_parser("Bcfg2 yum helper",
                                           components=[self])
+        parser.add_options(self.subcommand_options)
         parser.parse()
         self.logger = logging.getLogger(parser.prog)