valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update to new softwareproperties.ppa changes

Browse Source 
Closes #17105
This commit is contained in:
Mike Place 2014-11-04 11:24:12 -07:00
parent 4d362274a1
commit ded8a02d5d
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
salt/modules/aptpkg.py
View File

@ -1132,8 +1132,7 @@ def get_repo(repo, **kwargs):
ppa_name, dist)
else:
if HAS_SOFTWAREPROPERTIES:
repo = softwareproperties.ppa.expand_ppa_line(
repo,
repo = softwareproperties.ppa.PPAShortcutHandler(repo).expand(
__grains__['lsb_distrib_codename'])[0]
else:
repo = LP_SRC_FORMAT.format(owner_name, ppa_name, dist)
@ -1205,7 +1204,7 @@ def del_repo(repo, **kwargs):
else:
repo = LP_SRC_FORMAT.format(owner_name, ppa_name, dist)
else:
repo = softwareproperties.ppa.expand_ppa_line(repo, dist)[0]
repo = softwareproperties.ppa.PPAShortcutHandler(repo).expand(dist)[0]
sources = sourceslist.SourcesList()
repos = [s for s in sources.list if not s.invalid]
@ -1596,8 +1595,7 @@ def expand_repo_def(repokwargs):
dist)
else:
if HAS_SOFTWAREPROPERTIES:
repo = softwareproperties.ppa.expand_ppa_line(
repo, dist)[0]
repo = softwareproperties.ppa.PPAShortcutHandler(repo).expand(dist)[0]
else:
repo = LP_SRC_FORMAT.format(owner_name, ppa_name, dist)