diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-05-04 12:15:06 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-05-04 12:15:06 -0400 |
| commit | d94a58c5718d6e886ea1a2daff14f3939916be47 (patch) | |
| tree | a7104b72f0661ebcd6aca7f2c1229d4fc65756c0 /src | |
| parent | 8bc23e6ed36a435cfbab927c64487115efa33bf2 (diff) | |
| download | bcfg2-d94a58c5718d6e886ea1a2daff14f3939916be47.tar.gz bcfg2-d94a58c5718d6e886ea1a2daff14f3939916be47.tar.bz2 bcfg2-d94a58c5718d6e886ea1a2daff14f3939916be47.zip | |
check for bcfg2-yum-helper in $PATH first
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/Server/Plugins/Packages/Yum.py | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/src/lib/Server/Plugins/Packages/Yum.py b/src/lib/Server/Plugins/Packages/Yum.py index be5a68aa1..9ce462c78 100644 --- a/src/lib/Server/Plugins/Packages/Yum.py +++ b/src/lib/Server/Plugins/Packages/Yum.py @@ -111,10 +111,24 @@ class YumCollection(Collection): if has_pulp and self.has_pulp_sources: _setup_pulp(self.config) + self._helper = None + @property def helper(self): - return self.config.get("yum", "helper", - default="/usr/sbin/bcfg2-yum-helper") + try: + return self.config.get("yum", "helper") + except: + pass + + if not self._helper: + # first see if bcfg2-yum-helper is in PATH + 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 @property def use_yum(self): |