Merge pull request #52473 from Ch3LL/bp-49437

Backport #49437 into 2018.3
This commit is contained in:
Daniel Wozniak 2019-04-11 17:10:24 -07:00 committed by GitHub
commit 576478e6e0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1154,6 +1154,7 @@ def del_repo(repo, **kwargs): # pylint: disable=unused-argument
salt '*' pkg.del_repo repo
'''
refresh = salt.utils.data.is_true(kwargs.get('refresh', True))
repos = list_repos()
if repos:
deleted_from = dict()
@ -1179,8 +1180,8 @@ def del_repo(repo, **kwargs): # pylint: disable=unused-argument
except OSError:
pass
ret += msg.format(repo, repo_file)
# explicit refresh after a repo is deleted
refresh_db()
if refresh:
refresh_db()
return ret
return "Repo {0} doesn't exist in the opkg repo lists".format(repo)