Merge pull request #55705 from pkwestm/fix-zypper-upgrade-fromrepo-again

Fix zypper upgrade fromrepo again
saltstack · Jan 4, 2020 · b5d0cb0 · b5d0cb0
2 parents 0838f1e + 1b52efb
commit b5d0cb0
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 11 deletions.
diff --git a/salt/modules/zypperpkg.py b/salt/modules/zypperpkg.py
@@ -461,10 +461,12 @@ def list_upgrades(refresh=True, **kwargs):
     ret = dict()
     cmd = ['list-updates']
     if 'fromrepo' in kwargs:
-        repo_name = kwargs['fromrepo']
-        if not isinstance(repo_name, six.string_types):
-            repo_name = six.text_type(repo_name)
-        cmd.extend(['--repo', repo_name])
+        repos = kwargs['fromrepo']
+        if isinstance(repos, six.string_types):
+            repos = [repos]
+        for repo in repos:
+            cmd.extend(['--repo', repo if isinstance(repo, six.string_types) else six.text_type(repo)])
+        log.debug('Targeting repos: %s', repos)
     for update_node in __zypper__.nolock.xml.call(*cmd).getElementsByTagName('update'):
         if update_node.getAttribute('kind') == 'package':
             ret[update_node.getAttribute('name')] = update_node.getAttribute('edition')
@@ -1471,8 +1473,8 @@ def upgrade(refresh=True,
     .. code-block:: bash
 
         salt '*' pkg.upgrade
-        salt '*' pkg.upgrade dist-upgrade=True fromrepo='["MyRepoName"]' novendorchange=True
-        salt '*' pkg.upgrade dist-upgrade=True dryrun=True
+        salt '*' pkg.upgrade dist_upgrade=True fromrepo='["MyRepoName"]' novendorchange=True
+        salt '*' pkg.upgrade dist_upgrade=True dryrun=True
     '''
     cmd_update = (['dist-upgrade'] if dist_upgrade else ['update']) + ['--auto-agree-with-licenses']
 
@@ -1486,12 +1488,14 @@ def upgrade(refresh=True,
     if dryrun:
         cmd_update.append('--dry-run')
 
-    if dist_upgrade:
-        if fromrepo:
-            for repo in fromrepo:
-                cmd_update.extend(['--from', repo])
-            log.info('Targeting repos: %s', fromrepo)
+    if fromrepo:
+        if isinstance(fromrepo, six.string_types):
+            fromrepo = [fromrepo]
+        for repo in fromrepo:
+            cmd_update.extend(['--from' if dist_upgrade else '--repo', repo])
+        log.info('Targeting repos: %s', fromrepo)
 
+    if dist_upgrade:
         if novendorchange:
             # TODO: Grains validation should be moved to Zypper class
             if __grains__['osrelease_info'][0] > 11:

diff --git a/tests/unit/modules/test_zypperpkg.py b/tests/unit/modules/test_zypperpkg.py
@@ -459,6 +459,10 @@ def test_upgrade_success(self):
                                                 '--from', "Dummy", '--from', 'Dummy2', '--no-allow-vendor-change',
                                                 '--debug-solver')
 
+                with patch('salt.modules.zypperpkg.list_pkgs', MagicMock(side_effect=[{"vim": "1.1"}, {"vim": "1.1"}])):
+                    ret = zypper.upgrade(dist_upgrade=False, fromrepo=["Dummy", "Dummy2"], dryrun=False)
+                    zypper_mock.assert_any_call('update', '--auto-agree-with-licenses', '--repo', "Dummy", '--repo', 'Dummy2')
+
                 with patch('salt.modules.zypperpkg.list_pkgs', MagicMock(side_effect=[{"vim": "1.1"}, {"vim": "1.2"}])):
                     ret = zypper.upgrade(dist_upgrade=True, fromrepo=["Dummy", "Dummy2"], novendorchange=True)
                     self.assertDictEqual(ret, {"vim": {"old": "1.1", "new": "1.2"}})