diff options
| author | Sol Jerome <sol.jerome@gmail.com> | 2014-11-08 11:10:56 -0600 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2014-11-08 11:10:56 -0600 |
| commit | 5a9c685c53f13a8bf4dd55cf96ecf11d624d8fcf (patch) | |
| tree | c3ca7c47ee79361cff53dc3f1198186e2df8d42d /src | |
| parent | 6be5de9e8ed7e29d3763b36f870a2f470917f76d (diff) | |
| parent | ad438f9e17decda2efca0e8974995a6d028f7788 (diff) | |
| download | bcfg2-5a9c685c53f13a8bf4dd55cf96ecf11d624d8fcf.tar.gz bcfg2-5a9c685c53f13a8bf4dd55cf96ecf11d624d8fcf.tar.bz2 bcfg2-5a9c685c53f13a8bf4dd55cf96ecf11d624d8fcf.zip | |
Merge branch 'SYSV-use-simplefile' of https://github.com/fennm/bcfg2 into maint
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/Bcfg2/Client/Tools/SYSV.py | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/lib/Bcfg2/Client/Tools/SYSV.py b/src/lib/Bcfg2/Client/Tools/SYSV.py index a29b49efa..27c3d3785 100644 --- a/src/lib/Bcfg2/Client/Tools/SYSV.py +++ b/src/lib/Bcfg2/Client/Tools/SYSV.py @@ -52,18 +52,17 @@ class SYSV(Bcfg2.Client.Tools.PkgTool): self.origpkgtool = self.pkgtool def pkgmogrify(self, packages): - """ Take a list of pkg objects, check for a 'simplename' attribute. + """ Take a list of pkg objects, check for a 'simplefile' attribute. If present, insert a _sysv_pkg_path attribute to the package and download the datastream format SYSV package to a temporary file. """ for pkg in packages: - if pkg.get('simplename'): + if pkg.get('simplefile'): tmpfile = tempfile.NamedTemporaryFile() self.tmpfiles.append(tmpfile) - self.logger.info("Downloading %s%s to %s" % (pkg.get('url'), - pkg.get('simplename'), tmpfile.name)) - urlretrieve("%s/%s" % (pkg.get('url'), pkg.get('simplename')), - tmpfile.name) + self.logger.info("Downloading %s to %s" % (pkg.get('url'), + tmpfile.name)) + urlretrieve(pkg.get('url'), tmpfile.name) pkg.set('_sysv_pkg_path', tmpfile.name) def _get_package_command(self, packages): |