From ded8a02d5dad8317435f419e3488c0f275c6a6f9 Mon Sep 17 00:00:00 2001 From: Mike Place Date: Tue, 4 Nov 2014 11:24:12 -0700 Subject: [PATCH] Update to new softwareproperties.ppa changes Closes #17105 --- salt/modules/aptpkg.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/salt/modules/aptpkg.py b/salt/modules/aptpkg.py index aa25592184..b5f06c4ff1 100644 --- a/salt/modules/aptpkg.py +++ b/salt/modules/aptpkg.py @@ -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)