65598582f5
OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:saltstack/salt?expand=0&rev=179
29 lines
953 B
Diff
29 lines
953 B
Diff
From 210846eb33734a453b99ffb5ac9ef3f59dd0d742 Mon Sep 17 00:00:00 2001
|
|
From: Matei Albu <malbu@suse.de>
|
|
Date: Fri, 15 Feb 2019 14:34:13 +0100
|
|
Subject: [PATCH] Strip trailing "/" from repo.uri when comparing repos
|
|
in apktpkg.mod_repo (bsc#1146192)
|
|
|
|
(cherry picked from commit af85627)
|
|
---
|
|
salt/modules/aptpkg.py | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/salt/modules/aptpkg.py b/salt/modules/aptpkg.py
|
|
index c47ee852f4..658a16da4c 100644
|
|
--- a/salt/modules/aptpkg.py
|
|
+++ b/salt/modules/aptpkg.py
|
|
@@ -2429,7 +2429,7 @@ def mod_repo(repo, saltenv="base", **kwargs):
|
|
# has already been modified on a previous run.
|
|
repo_matches = (
|
|
source.type == repo_type
|
|
- and source.uri == repo_uri
|
|
+ and source.uri.rstrip("/") == repo_uri.rstrip("/")
|
|
and source.dist == repo_dist
|
|
)
|
|
kw_matches = source.dist == kw_dist and source.type == kw_type
|
|
--
|
|
2.29.2
|
|
|
|
|