public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
To: git-commits@fedoraproject.org
Subject: [rpms/s390utils] rawhide: - fix pvics return code
Date: Mon, 03 Aug 2026 13:29:27 GMT [thread overview]
Message-ID: <178576376749.1.9905210057441339954.rpms-s390utils-b49a02942d49@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/s390utils
Branch : rawhide
Commit : b49a02942d49e3770dc3500d8821e2174cd96d7c
Author : Dan Horák <dan@danny.cz>
Date : 2026-08-03T13:28:19+00:00
Stats : +38/-1 in 2 file(s)
URL : https://src.fedoraproject.org/rpms/s390utils/c/b49a02942d49e3770dc3500d8821e2174cd96d7c?branch=rawhide
Log:
- fix pvics return code
---
diff --git a/s390utils-2.44.0-pvics-return.patch b/s390utils-2.44.0-pvics-return.patch
new file mode 100644
index 0000000..e5c66da
--- /dev/null
+++ b/s390utils-2.44.0-pvics-return.patch
@@ -0,0 +1,30 @@
+diff --git a/scripts/pvics b/scripts/pvics
+index 18cdbb6b..8fe21a3b 100755
+--- a/scripts/pvics
++++ b/scripts/pvics
+@@ -1474,12 +1474,6 @@ main() {
+ local -
+ set -Eu
+
+- # call cleanup on error
+- # PIPE is needed to allow out=$(main list -i <image> | grep -m 1 <filter>)
+- # bash will close the subshell executing the main function as soon as grep has found a match
+- # cleanup will not be executed anymore
+- trap 'cleanup 1' ERR EXIT PIPE
+-
+ # general
+ ACTION=""
+ NBD=""
+@@ -1518,6 +1512,12 @@ main() {
+ # parse command line
+ cli "$@"
+
++ # call cleanup on error
++ # PIPE is needed to allow out=$(main list -i <image> | grep -m 1 <filter>)
++ # bash will close the subshell executing the main function as soon as grep has found a match
++ # cleanup will not be executed anymore
++ trap 'cleanup 1' ERR EXIT PIPE
++
+ # set up logger
+ setup_logger
+
diff --git a/s390utils.spec b/s390utils.spec
index 11dbcc4..5c6d475 100644
--- a/s390utils.spec
+++ b/s390utils.spec
@@ -17,7 +17,7 @@
Name: s390utils
Summary: Utilities and daemons for IBM z Systems
Version: 2.44.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Epoch: 2
# MIT covers nearly all the files, except init files (LGPL-2.1-or-later)
#
@@ -77,6 +77,10 @@ Source28: https://fedorapeople.org/cgit/sharkcz/public_git/utils.git/tree/
Patch0: s390-tools-zipl-invert-script-options.patch
Patch1: s390-tools-zipl-blscfg-rpm-nvr-sort.patch
+# temporary fixes
+# https://github.com/ibm-s390-linux/s390-tools/issues/208
+Patch90: s390utils-2.44.0-pvics-return.patch
+
# upstream fixes/updates
#Patch100: s390utils-%%{version}-fedora.patch
@@ -1145,6 +1149,9 @@ User-space development files for the s390/s390x architecture.
%changelog
+* Mon Aug 03 2026 Dan Horák <dan[at]danny.cz> - 2:2.44.0-2
+- fix pvics return code
+
* Fri Jul 31 2026 Dan Horák <dan[at]danny.cz> - 2:2.44.0-1
- rebased to 2.44.0 (rhbz#2509807)
reply other threads:[~2026-08-03 13:29 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178576376749.1.9905210057441339954.rpms-s390utils-b49a02942d49@fedoraproject.org \
--to=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox