Merge branch 'yum-helper-2' of https://github.com/gordonmessmer/bcfg2

2 files changed, 28 insertions, 26 deletions

diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py b/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py
index 14d6db8a0..846fb89cd 100644
--- a/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py
+++ b/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py
@@ -456,16 +456,13 @@ class YumCollection(Collection):
                 reponame = basereponame
 
                 added = False
+                rid = 1
                 while not added:
                     try:
                         config.add_section(reponame)
                         added = True
                     except ConfigParser.DuplicateSectionError:
-                        match = re.search(r'-(\d+)', reponame)
-                        if match:
-                            rid = int(match.group(1)) + 1
-                        else:
-                            rid = 1
+                        rid += 1
                         reponame = "%s-%d" % (basereponame, rid)
 
                 config.set(reponame, "name", reponame)
diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/YumHelper.py b/src/lib/Bcfg2/Server/Plugins/Packages/YumHelper.py
index b2e43bde7..89cc23090 100644
--- a/src/lib/Bcfg2/Server/Plugins/Packages/YumHelper.py
+++ b/src/lib/Bcfg2/Server/Plugins/Packages/YumHelper.py
@@ -274,29 +274,31 @@ class HelperSubcommand(Bcfg2.Options.Subcommand):
     # whether or not this command accepts input on stdin
     accept_input = True
 
-    def __init__(self):
-        Bcfg2.Options.Subcommand.__init__(self)
-        self.verbosity = 0
+    # logging level
+    verbosity = 0
+
+    def run(self, setup):
         if Bcfg2.Options.setup.debug:
             self.verbosity = 5
         elif Bcfg2.Options.setup.verbose:
             self.verbosity = 1
 
-    def run(self, setup):
-        try:
-            data = json.loads(sys.stdin.read())
-        except ValueError:
-            self.logger.error("Error decoding JSON input: %s" %
-                              sys.exc_info()[1])
-            print(json.dumps(self.fallback))
-            return 2
+        data = None
+        if self.accept_input:
+            try:
+                data = json.loads(sys.stdin.read())
+            except ValueError:
+                self.logger.error("Error decoding JSON input: %s" %
+                                  sys.exc_info()[1])
+                print(json.dumps(self.fallback))
+                return 2
 
         try:
             print(json.dumps(self._run(setup, data)))
         except:  # pylint: disable=W0702
             self.logger.error("Unexpected error running %s: %s" %
-                              self.__class__.__name__.lower(),
-                              sys.exc_info()[1], exc_info=1)
+                              (self.__class__.__name__.lower(),
+                               sys.exc_info()[1]), exc_info=1)
             print(json.dumps(self.fallback))
             return 2
         return 0
@@ -310,10 +312,13 @@ class DepSolverSubcommand(HelperSubcommand):  # pylint: disable=W0223
     """ Base class for helper commands that use the depsolver (i.e.,
     only resolve dependencies, don't modify the cache) """
 
-    def __init__(self):
-        HelperSubcommand.__init__(self)
+    # DepSolver instance used in _run function
+    depsolver = None
+
+    def run(self, setup):
         self.depsolver = DepSolver(Bcfg2.Options.setup.yum_config,
                                    self.verbosity)
+        HelperSubcommand.run(self, setup)
 
 
 class CacheManagerSubcommand(HelperSubcommand):  # pylint: disable=W0223
@@ -322,10 +327,13 @@ class CacheManagerSubcommand(HelperSubcommand):  # pylint: disable=W0223
     fallback = False
     accept_input = False
 
-    def __init__(self):
-        HelperSubcommand.__init__(self)
+    # CacheManager instance used in _run function
+    cachemgr = None
+
+    def run(self, setup):
         self.cachemgr = CacheManager(Bcfg2.Options.setup.yum_config,
                                      self.verbosity)
+        HelperSubcommand.run(self, setup)
 
 
 class Clean(CacheManagerSubcommand):
@@ -376,10 +384,7 @@ class CLI(Bcfg2.Options.CommandRegistry):
     """ The bcfg2-yum-helper CLI """
     options = [
         Bcfg2.Options.PathOption(
-            "-c", "--yum-config", help="Yum config file"),
-        Bcfg2.Options.PositionalArgument(
-            "command", help="Yum helper command",
-            choices=['clean', 'complete', 'get_groups'])]
+            "-c", "--yum-config", help="Yum config file")]
 
     def __init__(self):
         Bcfg2.Options.CommandRegistry.__init__(self)