wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix yum/dnf handling of URIs that don't end in .rpm (#49912)

Browse source 
Fixes #49727

Signed-off-by: Adam Miller <admiller@redhat.com>
(cherry picked from commit 0eabb8097b)
This commit is contained in:
Adam Miller 2018-12-14 13:44:40 -06:00 committed by Toshio Kuratomi
parent a11e0c184a
commit b710b40a0c
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/ansible/modules/packaging/os/dnf.py
View file

@ -726,9 +726,10 @@ class DnfModule(YumDnf):
already_loaded_comps = False # Only load this if necessary, it's slow
for name in self.names:
if name.endswith(".rpm"):
if '://' in name:
name = self.fetch_rpm_from_url(name)
if '://' in name:
name = self.fetch_rpm_from_url(name)
filenames.append(name)
elif name.endswith(".rpm"):
filenames.append(name)
elif name.startswith("@") or ('/' in name):
if not already_loaded_comps:

8
lib/ansible/modules/packaging/os/yum.py
View file

@ -872,7 +872,7 @@ class YumModule(YumDnf):
downgrade_candidate = False
# check if pkgspec is installed (if possible for idempotence)
if spec.endswith('.rpm'):
if spec.endswith('.rpm') or '://' in spec:
if '://' not in spec and not os.path.exists(spec):
res['msg'] += "No RPM file matching '%s' found on system" % spec
res['results'].append("No RPM file matching '%s' found on system" % spec)
@ -882,6 +882,12 @@ class YumModule(YumDnf):
if '://' in spec:
with self.set_env_proxy():
package = self.fetch_rpm_from_url(spec)
if not package.endswith('.rpm'):
# yum requires a local file to have the extension of .rpm and we
# can not guarantee that from an URL (redirects, proxies, etc)
new_package_path = '%s.rpm' % package
os.rename(package, new_package_path)
package = new_package_path
else:
package = spec