Update to 1.6.1-1

- New upstream release

Signed-off-by: Björn Bidar <bjorn.bidar@thaodan.de>

10 files changed, 52 insertions, 52 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 152247382171..4416e54b7a71 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = osc
 	pkgdesc = Command line client for the openSUSE Build Service
-	pkgver = 1.5.1
+	pkgver = 1.6.1
 	pkgrel = 1
 	url = https://github.com/openSUSE/osc
 	arch = any
@@ -19,7 +19,7 @@ pkgbase = osc
 	conflicts = zsh-completion-osc
 	replaces = osc-bash-completion
 	replaces = zsh-completion-osc
-	source = https://github.com/openSUSE/osc/archive/1.5.1.tar.gz
+	source = https://github.com/openSUSE/osc/archive/1.6.1.tar.gz
 	source = 0001-Add-sb2install-support-to-osc.patch
 	source = 0002-Support-osc-copyprj-in-api-by-Islam-Amer-usage-osc-c.patch
 	source = 0003-Support-synchronous-copyproj.patch
@@ -28,14 +28,14 @@ pkgbase = osc
 	source = 0006-Add-architecture-and-scheduler-maps.patch
 	source = 0007-Trap-any-kind-of-exception-during-plugin-parsing-eg-.patch
 	source = 0008-Fix-hdrmd5-check-of-downloaded-packages-from-DoD-rep.patch
-	sha256sums = 17b1268413561b3d1b8564d3d1ed8f025efa34774497df4d54205b6cf0882c28
-	sha256sums = 1e4a61c7ae267812de89459c715baa66115851d0f213f95f4ac46fe0f67802a3
-	sha256sums = 3ebca3c11b6985e3e90386662f21e8c6f7cc35d318ad48581069addd1a786c2f
-	sha256sums = ec60ca441997437044dd0847b275a2ee468b7ea8f9ae5f3ef35813e30008f075
-	sha256sums = 5dd6f4f56b80b82683bca27aca25a5c84315850193bdbee512f221df6f8023bf
-	sha256sums = 47f3d68a74b60fc2a8942b4a35dceb15c1ee9daf64bb6d64641e732bd0c9a506
-	sha256sums = eae5f978b8385db3acae46df96fc4973f306c4a640389165a8ac54469d370e5b
-	sha256sums = e98744f2644f3358280c81375f129f65289f8ed964bddcadfce40077ab7afe4e
-	sha256sums = 67c916cd7ba9dcd4899477c223c79f7087c0a0077d33f95ccb465b790e052547
+	sha256sums = da8d0317271335c91780ed397fd61b8d4bafff0e4e8b41f6bf88441e87c78bc8
+	sha256sums = 878e66de3e15f3f070c63002990315dc6e54e1e864c85eead81c386453aeb24a
+	sha256sums = 241e0f71d51cef7a53dd9024f725527164f002d0b9370385c3bc3e1d69a8f8ce
+	sha256sums = d0286a035fc4facc5a380f2523ab5a01106c903a3039fcf09cb9958c63137f5d
+	sha256sums = 50f1955fc3080752abb94da9986ce676b7a6ace7016e4dc3380e825b95e45891
+	sha256sums = 8e7fda9dca156604a48e918becaafe7f7f425cfd5ec7cc2e2de2d5aa73924ee0
+	sha256sums = 579b110f3dc03001b7eac3581264200612dac66c2186e6841eda3573f455daf1
+	sha256sums = 73f4ae53567671c5c5bd3a524abfe1b8195e654726963c2e86fa56d5f0a125df
+	sha256sums = 56b8e020440fdffcf5e9ee14b5d59a7309abbc708862c2e903ef2275c57cf401
 
 pkgname = osc
diff --git a/0001-Add-sb2install-support-to-osc.patch b/0001-Add-sb2install-support-to-osc.patch
index efdb5898e9f6..f4e4aeb6fbf6 100644
--- a/0001-Add-sb2install-support-to-osc.patch
+++ b/0001-Add-sb2install-support-to-osc.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] Add sb2install support to osc
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/osc/build.py b/osc/build.py
-index c93072af1d98e8ba4575f3084a39087a7920d483..096e6c40998e35650b857d09cce41cfc95e10f67 100644
+index b77b8ff2b7f4c50c6e0539c804b96b0e865db184..3f955f70c46dbcbec504dffb50ac993f1b53299b 100644
 --- a/osc/build.py
 +++ b/osc/build.py
 @@ -192,6 +192,7 @@ class Buildinfo:
@@ -29,7 +29,7 @@ index c93072af1d98e8ba4575f3084a39087a7920d483..096e6c40998e35650b857d09cce41cfc
              self.mp[i] = node.get(i)
  
          self.mp['buildarch'] = buildarch
-@@ -1430,6 +1432,7 @@ def main(apiurl, store, opts, argv):
+@@ -1435,6 +1437,7 @@ def main(apiurl, store, opts, argv):
  
      rpmlist.append('preinstall: ' + ' '.join(bi.preinstall_list) + '\n')
      rpmlist.append('vminstall: ' + ' '.join(bi.vminstall_list) + '\n')
diff --git a/0002-Support-osc-copyprj-in-api-by-Islam-Amer-usage-osc-c.patch b/0002-Support-osc-copyprj-in-api-by-Islam-Amer-usage-osc-c.patch
index 92d70cce58d0..0842fd650140 100644
--- a/0002-Support-osc-copyprj-in-api-by-Islam-Amer-usage-osc-c.patch
+++ b/0002-Support-osc-copyprj-in-api-by-Islam-Amer-usage-osc-c.patch
@@ -13,10 +13,10 @@ Subject: [PATCH] Support 'osc copyprj' in api by Islam Amer usage: osc copyprj
  2 files changed, 80 insertions(+)
 
 diff --git a/osc/commandline.py b/osc/commandline.py
-index b7c19bc63e1dbd5566ead116890df62a72a4bb05..7fc9dd5c47cb46d494f206a94793511e5fe901de 100644
+index 6159ccdac390828f95f55a9abd15559a0e08e327..d65eb6417d8aa219c1d2a0ac1ca6a9bbad6508da 100644
 --- a/osc/commandline.py
 +++ b/osc/commandline.py
-@@ -2106,6 +2106,58 @@ class Osc(cmdln.Cmdln):
+@@ -2112,6 +2112,58 @@ class Osc(cmdln.Cmdln):
              else:
                  raise oscerr.WrongOptions('The --delete switch is only for pattern metadata or attributes.')
  
@@ -76,11 +76,11 @@ index b7c19bc63e1dbd5566ead116890df62a72a4bb05..7fc9dd5c47cb46d494f206a94793511e
  
      @cmdln.option('-m', '--message', metavar='TEXT',
 diff --git a/osc/core.py b/osc/core.py
-index 3a5543dc356d9831d5f868ff0ae62155e4135682..116d4f2e895d1ed03aba483588cd78ef168175f7 100644
+index 04bfcd943162bd92bf4ffe19ba002f9fbd8e2538..a5c7236f875b8816b375b9d5976b8a4bb8d5b6d8 100644
 --- a/osc/core.py
 +++ b/osc/core.py
-@@ -6279,6 +6279,34 @@ def copy_pac(
-             raise oscerr.APIError('failed to copy: %s' % ', '.join(todo))
+@@ -6313,6 +6313,34 @@ def copy_pac(
+             raise oscerr.APIError(f"failed to copy: {', '.join(todo)}")
          return 'Done.'
  
 +def copy_prj(src_apiurl, src_project, dst_project,
diff --git a/0003-Support-synchronous-copyproj.patch b/0003-Support-synchronous-copyproj.patch
index be6599cb2f9e..5a65e45023e8 100644
--- a/0003-Support-synchronous-copyproj.patch
+++ b/0003-Support-synchronous-copyproj.patch
@@ -9,10 +9,10 @@ Subject: [PATCH] Support synchronous copyproj
  2 files changed, 7 insertions(+)
 
 diff --git a/osc/commandline.py b/osc/commandline.py
-index 7fc9dd5c47cb46d494f206a94793511e5fe901de..46bbc28087338961ff09cabc964ae0024a73001c 100644
+index d65eb6417d8aa219c1d2a0ac1ca6a9bbad6508da..3e44189b69155f645b063d93362f652df849b826 100644
 --- a/osc/commandline.py
 +++ b/osc/commandline.py
-@@ -2108,6 +2108,8 @@ class Osc(cmdln.Cmdln):
+@@ -2114,6 +2114,8 @@ class Osc(cmdln.Cmdln):
  
      @cmdln.option('-b', '--with-binaries', action='store_true',
                          help='copy the built binaries over to avoid a rebuild')
@@ -21,7 +21,7 @@ index 7fc9dd5c47cb46d494f206a94793511e5fe901de..46bbc28087338961ff09cabc964ae002
      @cmdln.option('-H', '--with-history', action='store_true',
                          help='replicate the history of each package.')
      @cmdln.option('-o', '--make-older', action='store_true',
-@@ -2126,6 +2128,8 @@ class Osc(cmdln.Cmdln):
+@@ -2132,6 +2134,8 @@ class Osc(cmdln.Cmdln):
  
          The user must be able to create DESTPRJ
  
@@ -30,7 +30,7 @@ index 7fc9dd5c47cb46d494f206a94793511e5fe901de..46bbc28087338961ff09cabc964ae002
          usage:
              osc copyprj SOURCEPRJ DESTPRJ
          """
-@@ -2154,6 +2158,7 @@ class Osc(cmdln.Cmdln):
+@@ -2160,6 +2164,7 @@ class Osc(cmdln.Cmdln):
                       withhistory = opts.with_history,
                       makeolder = opts.make_older,
                       resign = opts.re_sign,
@@ -39,10 +39,10 @@ index 7fc9dd5c47cb46d494f206a94793511e5fe901de..46bbc28087338961ff09cabc964ae002
          print("done cp")
          print(r)
 diff --git a/osc/core.py b/osc/core.py
-index 116d4f2e895d1ed03aba483588cd78ef168175f7..d3d4ca9cf3b3cfc6ad966fa3692cfa019d8d567c 100644
+index a5c7236f875b8816b375b9d5976b8a4bb8d5b6d8..a20886bfe0c3705bed233368ac06f07392f33f5a 100644
 --- a/osc/core.py
 +++ b/osc/core.py
-@@ -6303,6 +6303,8 @@ def copy_prj(src_apiurl, src_project, dst_project,
+@@ -6337,6 +6337,8 @@ def copy_prj(src_apiurl, src_project, dst_project,
          query['resign'] = '1'
      if comment:
          query['comment'] = comment
diff --git a/0004-Add-p-to-copyprj-to-enable-copying-of-prjconf.patch b/0004-Add-p-to-copyprj-to-enable-copying-of-prjconf.patch
index 104f9103df49..ca438fcd4b38 100644
--- a/0004-Add-p-to-copyprj-to-enable-copying-of-prjconf.patch
+++ b/0004-Add-p-to-copyprj-to-enable-copying-of-prjconf.patch
@@ -9,10 +9,10 @@ Subject: [PATCH] Add -p to copyprj to enable copying of prjconf
  2 files changed, 8 insertions(+)
 
 diff --git a/osc/commandline.py b/osc/commandline.py
-index 46bbc28087338961ff09cabc964ae0024a73001c..c7ad5927974123bae6e31bd23057ffd6f6d1ecdd 100644
+index 3e44189b69155f645b063d93362f652df849b826..6e4b55ea04b037ae2fb0fb063a812849a0e523cc 100644
 --- a/osc/commandline.py
 +++ b/osc/commandline.py
-@@ -2114,6 +2114,8 @@ class Osc(cmdln.Cmdln):
+@@ -2120,6 +2120,8 @@ class Osc(cmdln.Cmdln):
                          help='replicate the history of each package.')
      @cmdln.option('-o', '--make-older', action='store_true',
                          help='No idea')
@@ -21,7 +21,7 @@ index 46bbc28087338961ff09cabc964ae0024a73001c..c7ad5927974123bae6e31bd23057ffd6
      @cmdln.option('-r', '--re-sign', action='store_true',
                          help='re-sign the binaries')
      @cmdln.option('-m', '--message', metavar='TEXT',
-@@ -2156,6 +2158,7 @@ class Osc(cmdln.Cmdln):
+@@ -2162,6 +2164,7 @@ class Osc(cmdln.Cmdln):
          r = copy_prj(src_apiurl, src_project, dst_project,
                       withbinaries = opts.with_binaries,
                       withhistory = opts.with_history,
@@ -30,10 +30,10 @@ index 46bbc28087338961ff09cabc964ae0024a73001c..c7ad5927974123bae6e31bd23057ffd6
                       resign = opts.re_sign,
                       now = opts.now,
 diff --git a/osc/core.py b/osc/core.py
-index d3d4ca9cf3b3cfc6ad966fa3692cfa019d8d567c..d79c1bac7e35daa73a700344c23410be16adfe9e 100644
+index a20886bfe0c3705bed233368ac06f07392f33f5a..ab35e460da43def0bdc39b3c1c0499c4666df1c5 100644
 --- a/osc/core.py
 +++ b/osc/core.py
-@@ -6282,8 +6282,10 @@ def copy_pac(
+@@ -6316,8 +6316,10 @@ def copy_pac(
  def copy_prj(src_apiurl, src_project, dst_project,
               withbinaries = False,
               withhistory = False,
@@ -44,7 +44,7 @@ index d3d4ca9cf3b3cfc6ad966fa3692cfa019d8d567c..d79c1bac7e35daa73a700344c23410be
               comment = None):
      """
      Create a copy of a project.
-@@ -6297,6 +6299,8 @@ def copy_prj(src_apiurl, src_project, dst_project,
+@@ -6331,6 +6333,8 @@ def copy_prj(src_apiurl, src_project, dst_project,
          query['withbinaries'] = '1'
      if withhistory:
          query['withhistory'] = '1'
@@ -53,7 +53,7 @@ index d3d4ca9cf3b3cfc6ad966fa3692cfa019d8d567c..d79c1bac7e35daa73a700344c23410be
      if makeolder:
          query['makeolder'] = '1'
      if resign:
-@@ -6305,6 +6309,7 @@ def copy_prj(src_apiurl, src_project, dst_project,
+@@ -6339,6 +6343,7 @@ def copy_prj(src_apiurl, src_project, dst_project,
          query['comment'] = comment
      if now:
          query['nodelay'] = '1'
diff --git a/0005-Add-support-for-rebuild-and-chroot-only-in-build.-re.patch b/0005-Add-support-for-rebuild-and-chroot-only-in-build.-re.patch
index 01cbfebde5e4..8a696477d423 100644
--- a/0005-Add-support-for-rebuild-and-chroot-only-in-build.-re.patch
+++ b/0005-Add-support-for-rebuild-and-chroot-only-in-build.-re.patch
@@ -14,10 +14,10 @@ Subject: [PATCH] Add support for --rebuild and --chroot-only in build.
  2 files changed, 10 insertions(+)
 
 diff --git a/osc/build.py b/osc/build.py
-index 096e6c40998e35650b857d09cce41cfc95e10f67..ef18a0b8cb61ae96a013f526775cd7644acce648 100644
+index 3f955f70c46dbcbec504dffb50ac993f1b53299b..d5c232643a3f701543a1fe8b97faa122d9f536b2 100644
 --- a/osc/build.py
 +++ b/osc/build.py
-@@ -727,6 +727,12 @@ def main(apiurl, store, opts, argv):
+@@ -729,6 +729,12 @@ def main(apiurl, store, opts, argv):
          buildargs.append('--norootforbuild')
      if opts.clean:
          buildargs.append('--clean')
@@ -31,10 +31,10 @@ index 096e6c40998e35650b857d09cce41cfc95e10f67..ef18a0b8cb61ae96a013f526775cd764
          buildargs.append('--no-checks')
      if not opts.no_changelog:
 diff --git a/osc/commandline.py b/osc/commandline.py
-index c7ad5927974123bae6e31bd23057ffd6f6d1ecdd..2866ceead87dd276b10ac845f9a996c67e350704 100644
+index 6e4b55ea04b037ae2fb0fb063a812849a0e523cc..b8906e79762235c514b6f32d0c8c7bd8c4474b0d 100644
 --- a/osc/commandline.py
 +++ b/osc/commandline.py
-@@ -7119,6 +7119,10 @@ Please submit there instead, or use --nodevelproject to force direct submission.
+@@ -7130,6 +7130,10 @@ Please submit there instead, or use --nodevelproject to force direct submission.
                    help='Copy overlay filesystem to buildroot after installing all RPMs .')
      @cmdln.option('--noinit', '--no-init', action='store_true',
                    help='Skip initialization of build root and start with build immediately.')
diff --git a/0006-Add-architecture-and-scheduler-maps.patch b/0006-Add-architecture-and-scheduler-maps.patch
index e38914d086bb..df3f27de2e0c 100644
--- a/0006-Add-architecture-and-scheduler-maps.patch
+++ b/0006-Add-architecture-and-scheduler-maps.patch
@@ -13,7 +13,7 @@ command.
  1 file changed, 4 insertions(+)
 
 diff --git a/osc/util/packagequery.py b/osc/util/packagequery.py
-index 39356f5e6840d186f67dd52e10c86913ae8e60a5..df4f92bbe839ee3e954a29697152adfbe1c97ae7 100644
+index 593978491664423875e08c9168a2ab7db32f97dd..f817e472c1e2fac6f9d30356cf7e38f296e0d1c6 100644
 --- a/osc/util/packagequery.py
 +++ b/osc/util/packagequery.py
 @@ -21,6 +21,10 @@ class PackageQueries(dict):
diff --git a/0007-Trap-any-kind-of-exception-during-plugin-parsing-eg-.patch b/0007-Trap-any-kind-of-exception-during-plugin-parsing-eg-.patch
index 21d6c3066fcf..92363f7ead63 100644
--- a/0007-Trap-any-kind-of-exception-during-plugin-parsing-eg-.patch
+++ b/0007-Trap-any-kind-of-exception-during-plugin-parsing-eg-.patch
@@ -9,15 +9,15 @@ Subject: [PATCH] Trap any kind of exception during plugin parsing (eg IOError
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/osc/commandline.py b/osc/commandline.py
-index 2866ceead87dd276b10ac845f9a996c67e350704..5ebd0cecc876ee8499b5010f2739db643cf9a50c 100644
+index b8906e79762235c514b6f32d0c8c7bd8c4474b0d..b78993cdb093198440ccbc9e7ed481c6f2d9759b 100644
 --- a/osc/commandline.py
 +++ b/osc/commandline.py
-@@ -10164,7 +10164,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
+@@ -10177,7 +10177,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
                          if (inspect.isfunction(data) and inspect.getmodule(data) == mod
                                  or inspect.ismodule(data)):
                              setattr(self.__class__, name, data)
 -                except (SyntaxError, NameError, ImportError) as e:
 +                except (SyntaxError, NameError, ImportError, IOError) as e:
                      if os.environ.get('OSC_PLUGIN_FAIL_IGNORE'):
-                         print("%s: %s\n" % (os.path.join(plugin_dir, extfile), e), file=sys.stderr)
+                         print(f"{os.path.join(plugin_dir, extfile)}: {e}\n", file=sys.stderr)
                      else:
diff --git a/0008-Fix-hdrmd5-check-of-downloaded-packages-from-DoD-rep.patch b/0008-Fix-hdrmd5-check-of-downloaded-packages-from-DoD-rep.patch
index b30d58e38006..fa3be6b03c4a 100644
--- a/0008-Fix-hdrmd5-check-of-downloaded-packages-from-DoD-rep.patch
+++ b/0008-Fix-hdrmd5-check-of-downloaded-packages-from-DoD-rep.patch
@@ -17,10 +17,10 @@ Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>
  1 file changed, 9 insertions(+), 7 deletions(-)
 
 diff --git a/osc/fetch.py b/osc/fetch.py
-index bcee5dde4d975b314d98978673fe41726092215f..fd79979001fa709c74e47919692a0dbd8d98c0e2 100644
+index 8ed75a58c7e2caf5febb96cd862e0065f478b58a..90e8321575b1df8d91388314d1cecd4d281d9792 100644
 --- a/osc/fetch.py
 +++ b/osc/fetch.py
-@@ -271,14 +271,16 @@ class Fetcher:
+@@ -270,14 +270,16 @@ class Fetcher:
                          # mark it for downloading from the API
                          self.__add_cpio(i)
                      else:
diff --git a/PKGBUILD b/PKGBUILD
index 0c8ff2ddda33..d5338104b8fc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,8 +6,8 @@
 # Contributor : Patrick McCarty  <pnorcks at gmail dot com>
 
 pkgname=osc
-pkgver=1.5.1
-pkgrel=2
+pkgver=1.6.1
+pkgrel=1
 pkgdesc="Command line client for the openSUSE Build Service"
 arch=(any)
 url="https://github.com/openSUSE/osc"
@@ -63,14 +63,14 @@ package() {
 
 }
 
-sha256sums=('17b1268413561b3d1b8564d3d1ed8f025efa34774497df4d54205b6cf0882c28'
-            '1e4a61c7ae267812de89459c715baa66115851d0f213f95f4ac46fe0f67802a3'
-            '3ebca3c11b6985e3e90386662f21e8c6f7cc35d318ad48581069addd1a786c2f'
-            'ec60ca441997437044dd0847b275a2ee468b7ea8f9ae5f3ef35813e30008f075'
-            '5dd6f4f56b80b82683bca27aca25a5c84315850193bdbee512f221df6f8023bf'
-            '47f3d68a74b60fc2a8942b4a35dceb15c1ee9daf64bb6d64641e732bd0c9a506'
-            'eae5f978b8385db3acae46df96fc4973f306c4a640389165a8ac54469d370e5b'
-            'e98744f2644f3358280c81375f129f65289f8ed964bddcadfce40077ab7afe4e'
-            '67c916cd7ba9dcd4899477c223c79f7087c0a0077d33f95ccb465b790e052547')
+sha256sums=('da8d0317271335c91780ed397fd61b8d4bafff0e4e8b41f6bf88441e87c78bc8'
+            '878e66de3e15f3f070c63002990315dc6e54e1e864c85eead81c386453aeb24a'
+            '241e0f71d51cef7a53dd9024f725527164f002d0b9370385c3bc3e1d69a8f8ce'
+            'd0286a035fc4facc5a380f2523ab5a01106c903a3039fcf09cb9958c63137f5d'
+            '50f1955fc3080752abb94da9986ce676b7a6ace7016e4dc3380e825b95e45891'
+            '8e7fda9dca156604a48e918becaafe7f7f425cfd5ec7cc2e2de2d5aa73924ee0'
+            '579b110f3dc03001b7eac3581264200612dac66c2186e6841eda3573f455daf1'
+            '73f4ae53567671c5c5bd3a524abfe1b8195e654726963c2e86fa56d5f0a125df'
+            '56b8e020440fdffcf5e9ee14b5d59a7309abbc708862c2e903ef2275c57cf401')
 
 # vim:set sts=2 ts=2 sw=2 et: