9ce4d6f2a0
OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:saltstack/salt?expand=0&rev=133
43 lines
1.8 KiB
Diff
43 lines
1.8 KiB
Diff
From 5e0fe08c6afd75a7d65d6ccd6cf6b4b197fb1064 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?C=C3=A9dric=20Bosdonnat?= <cbosdonnat@suse.com>
|
|
Date: Tue, 29 Jan 2019 09:44:03 +0100
|
|
Subject: [PATCH] Don't call zypper with more than one --no-refresh
|
|
|
|
Now zypper started being picky and errors out when --no-refresh is
|
|
passed twice. Make sure we won't hit this.
|
|
---
|
|
salt/modules/zypperpkg.py | 2 +-
|
|
tests/unit/modules/test_zypperpkg.py | 2 +-
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/salt/modules/zypperpkg.py b/salt/modules/zypperpkg.py
|
|
index 92e7052020..7ac0df26c6 100644
|
|
--- a/salt/modules/zypperpkg.py
|
|
+++ b/salt/modules/zypperpkg.py
|
|
@@ -282,7 +282,7 @@ class _Zypper(object):
|
|
self.__called = True
|
|
if self.__xml:
|
|
self.__cmd.append('--xmlout')
|
|
- if not self.__refresh:
|
|
+ if not self.__refresh and '--no-refresh' not in args:
|
|
self.__cmd.append('--no-refresh')
|
|
|
|
self.__cmd.extend(args)
|
|
diff --git a/tests/unit/modules/test_zypperpkg.py b/tests/unit/modules/test_zypperpkg.py
|
|
index f586c23fd0..5c5091a570 100644
|
|
--- a/tests/unit/modules/test_zypperpkg.py
|
|
+++ b/tests/unit/modules/test_zypperpkg.py
|
|
@@ -138,7 +138,7 @@ class ZypperTestCase(TestCase, LoaderModuleMockMixin):
|
|
self.assertEqual(zypper.__zypper__.call('foo'), stdout_xml_snippet)
|
|
self.assertEqual(len(sniffer.calls), 1)
|
|
|
|
- zypper.__zypper__.call('bar')
|
|
+ zypper.__zypper__.call('--no-refresh', 'bar')
|
|
self.assertEqual(len(sniffer.calls), 2)
|
|
self.assertEqual(sniffer.calls[0]['args'][0], ['zypper', '--non-interactive', '--no-refresh', 'foo'])
|
|
self.assertEqual(sniffer.calls[1]['args'][0], ['zypper', '--non-interactive', '--no-refresh', 'bar'])
|
|
--
|
|
2.20.1
|
|
|
|
|