From 15e86f26c8781c2a61d241de374e2724761242e1 Mon Sep 17 00:00:00 2001
From: "Chris St. Pierre" <chris.a.st.pierre@gmail.com>
Date: Wed, 14 Nov 2012 11:15:49 -0500
Subject: only try to find bcfg2-yum-helper in $PATH once

---
 src/lib/Bcfg2/Server/Plugins/Packages/Yum.py | 31 ++++++++++++++--------------
 1 file changed, 16 insertions(+), 15 deletions(-)

(limited to 'src')

diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py b/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py
index a7129fc7a..220146100 100644
--- a/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py
+++ b/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py
@@ -102,6 +102,9 @@ FL = '{http://linux.duke.edu/metadata/filelists}'
 PULPSERVER = None
 PULPCONFIG = None
 
+#: The path to bcfg2-yum-helper
+HELPER = None
+
 
 def _setup_pulp(setup):
     """ Connect to a Pulp server and pass authentication credentials.
@@ -308,8 +311,6 @@ class YumCollection(Collection):
                                           (certdir, err))
                 self.pulp_cert_set = PulpCertificateSet(certdir, self.fam)
 
-        self._helper = None
-
     @property
     def __package_groups__(self):
         """ YumCollections support package groups only if
@@ -324,20 +325,20 @@ class YumCollection(Collection):
         a call to it; I wish there was a way to do this without
         forking, but apparently not); finally we check in /usr/sbin,
         the default location. """
-        try:
-            return self.setup.cfp.get("packages:yum", "helper")
-        except (ConfigParser.NoOptionError, ConfigParser.NoSectionError):
-            pass
-
-        if not self._helper:
-            # first see if bcfg2-yum-helper is in PATH
+        global HELPER
+        if not HELPER:
             try:
-                Popen(['bcfg2-yum-helper'],
-                      stdin=PIPE, stdout=PIPE, stderr=PIPE).wait()
-                self._helper = 'bcfg2-yum-helper'
-            except OSError:
-                self._helper = "/usr/sbin/bcfg2-yum-helper"
-        return self._helper
+                HELPER = self.setup.cfp.get("packages:yum", "helper")
+            except (ConfigParser.NoOptionError, ConfigParser.NoSectionError):
+                # first see if bcfg2-yum-helper is in PATH
+                try:
+                    self.debug_log("Checking for bcfg2-yum-helper in $PATH")
+                    Popen(['bcfg2-yum-helper'],
+                          stdin=PIPE, stdout=PIPE, stderr=PIPE).wait()
+                    HELPER = 'bcfg2-yum-helper'
+                except OSError:
+                    HELPER = "/usr/sbin/bcfg2-yum-helper"
+        return HELPER
 
     @property
     def use_yum(self):
-- 
cgit v1.2.3-1-g7c22