saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #45840 from rallytime/bp-45603

Browse source 
Back-port #45603 to 2017.7
This commit is contained in:
Nicole Thomas 2018-02-02 15:17:31 -05:00 • committed by GitHub
commit 0a04f118c2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
salt/states/pkgrepo.py
View file

@ -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':