Merge pull request #37167 from luitzifa/dnf-fix-yumpkg

fixes pkgrepo for fedora>22
saltstack · Oct 24, 2016 · cf0c149 · cf0c149
2 parents 0eb2565 + 40ecc46
commit cf0c149
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/salt/modules/yumpkg.py b/salt/modules/yumpkg.py
@@ -287,7 +287,7 @@ def _get_yum_config():
         # fall back to parsing the config ourselves
         # Look for the config the same order yum does
         fn = None
-        paths = ('/etc/yum/yum.conf', '/etc/yum.conf')
+        paths = ('/etc/yum/yum.conf', '/etc/yum.conf', '/etc/dnf/dnf.conf')
         for path in paths:
             if os.path.exists(path):
                 fn = path