summaryrefslogtreecommitdiff
path: root/lib/chef/provider
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2016-12-02 15:09:30 -0800
committerLamont Granquist <lamont@scriptkiddie.org>2016-12-13 13:31:51 -0800
commitb4d24ddda8332a274fa9c3ea5eb72dc6807db298 (patch)
tree006c68b7653c75d9b9ca72615664378b3bd3dc9d /lib/chef/provider
parent8e2824fcf3dc822b8ca4dc4b06df4979392ee050 (diff)
downloadchef-b4d24ddda8332a274fa9c3ea5eb72dc6807db298.tar.gz
arches were legit busted, fixing add a couple tests
Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
Diffstat (limited to 'lib/chef/provider')
-rw-r--r--lib/chef/provider/package/dnf_helper.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/chef/provider/package/dnf_helper.py b/lib/chef/provider/package/dnf_helper.py
index 6295df5892..4f85dda898 100644
--- a/lib/chef/provider/package/dnf_helper.py
+++ b/lib/chef/provider/package/dnf_helper.py
@@ -46,8 +46,10 @@ def query(command):
if 'arch' in command:
q = q.filterm(arch__glob=command['arch'])
- # FIXME: if the filter already selected the other arch this will be busted?
- q = q.filter(arch=[ 'noarch', hawkey.detect_arch() ])
+ # only apply the default arch query filter if it returns something
+ archq = q.filter(arch=[ 'noarch', hawkey.detect_arch() ])
+ if len(archq.run()) > 0:
+ q = archq
pkgs = dnf.query.latest_limit_pkgs(q, 1)