diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-07-22 11:44:23 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-07-22 11:44:23 -0400 |
| commit | 752da22a2247892f647c0a9c46e7b0faf9351ea6 (patch) | |
| tree | e2be41a6321ae7e175c7d1466fc68557689c3f35 /src/lib/Bcfg2/Server/Plugins/Packages | |
| parent | 7d544a289852c761fc209772064f794fb0472198 (diff) | |
| download | bcfg2-752da22a2247892f647c0a9c46e7b0faf9351ea6.tar.gz bcfg2-752da22a2247892f647c0a9c46e7b0faf9351ea6.tar.bz2 bcfg2-752da22a2247892f647c0a9c46e7b0faf9351ea6.zip | |
Packages: instantiate Executor before determining path to helper
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins/Packages')
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Packages/Yum.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py b/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py index e0002ef34..48c5b1f65 100644 --- a/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py +++ b/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py @@ -104,9 +104,6 @@ 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. @@ -279,6 +276,10 @@ class YumCollection(Collection): debug=debug) self.keypath = os.path.join(self.cachepath, "keys") + #: A :class:`Bcfg2.Utils.Executor` object to use to run + #: external commands + self.cmd = Executor() + self._helper = None if self.use_yum: #: Define a unique cache file for this collection to use @@ -295,10 +296,8 @@ class YumCollection(Collection): os.mkdir(self.cachefile) if not self.disableMetaData: self.setup_data() - self.cmd = Executor() else: self.cachefile = None - self.cmd = None if HAS_PULP and self.has_pulp_sources: _setup_pulp(self.setup) |