koji

Clone

#1389 block_pkglist compatibility fix
Merged 5 years ago by mikem. Opened 5 years ago by tkopecek.
tkopecek/koji issue1388  into  master

file modified
+6 -1 
@@ -388,7 +388,12 @@ 
 

          return ret
 

      session.multicall = True
 

      for package in args[1:]:
 

-         session.packageListBlock(tag, package, force=options.force)
 

+         # force is not supported on older hub, so use it only explicitly
 

+         # https://pagure.io/koji/issue/1388
 

+         if options.force:
 

+             session.packageListBlock(tag, package, force=options.force)
 

+         else:
 

+             session.packageListBlock(tag, package)
 

      session.multiCall(strict=True)

file modified
+3 -3 
@@ -82,9 +82,9 @@ 
 

              session.mock_calls, [
 

                  call.getTag(tag),
 

                  call.listPackages(tagID=dsttag['id'], inherited=True),
 

-                 call.packageListBlock(tag, packages[0], force=False),
 

-                 call.packageListBlock(tag, packages[1], force=False),
 

-                 call.packageListBlock(tag, packages[2], force=False),
 

+                 call.packageListBlock(tag, packages[0]),
 

+                 call.packageListBlock(tag, packages[1]),
 

+                 call.packageListBlock(tag, packages[2]),
 

                  call.multiCall(strict=True)])
 

          self.assertNotEqual(rv, 1)

On older hubs --force is not supported, so CLI will fail on unknown
parameter. This use force option only if it is explicitly required.

Fixes: https://pagure.io/koji/issue/1388

:thumbsup:

Commit 0bd77c4 fixes this pull-request

Pull-Request has been merged by mikem
5 years ago
Changes Summary 2
+6 -1
file changed
cli/koji_cli/commands.py
+3 -3
file changed
tests/test_cli/test_block_pkg.py
Powered by Pagure 5.13.3
Documentation • File an Issue • About • SSH Hostkey/Fingerprint
© Red Hat, Inc. and others.