Merge pull request #45840 from rallytime/bp-45603

Back-port #45603 to 2017.7
saltstack · Feb 2, 2018 · 0a04f11 · 0a04f11
2 parents bd2178c + 9653363
commit 0a04f11
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/salt/states/pkgrepo.py b/salt/states/pkgrepo.py
@@ -377,6 +377,9 @@ def managed(name, ppa=None, **kwargs):
         repo = salt.utils.pkg.deb.strip_uri(repo)
 
     if pre:
+        #22412: Remove file attribute in case same repo is set up multiple times but with different files
+        pre.pop('file', None)
+        sanitizedkwargs.pop('file', None)
         for kwarg in sanitizedkwargs:
             if kwarg not in pre:
                 if kwarg == 'enabled':