8bc8eaf64f
- fix detection of base products in SLE11 * 0030-Bugfix-on-SLE11-series-base-product-reported-as-addi.patch - fix rpm info for SLE11 * 0031-Only-use-LONGSIZE-in-rpm.info-if-available.-Otherwis.patch * 0032-Add-error-check-when-retcode-is-0-but-stderr-is-pres.patch - fix init system detection for SLE11 * 0033-fixing-init-system-dectection-on-sles-11-refs-31617.patch - Re-add corrected patch: 0029-Make-use-of-checksum-configurable-defaults-to-MD5-SH.patch - Make checksum configurable (upstream still wants md5, we suggest sha256). bsc#955373 Add: 0029-Make-use-of-checksum-configurable-defaults-to-MD5-SH.patch OBS-URL: https://build.opensuse.org/request/show/370869 OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:saltstack/salt?expand=0&rev=62
27 lines
775 B
Diff
27 lines
775 B
Diff
From 5c0c3da01e3e64e7614d9d3cc52d8d9c18a06230 Mon Sep 17 00:00:00 2001
|
|
From: rallytime <nicole@saltstack.com>
|
|
Date: Tue, 23 Feb 2016 17:26:52 -0700
|
|
Subject: [PATCH 32/33] Add error check when retcode is 0, but stderr is
|
|
present
|
|
|
|
---
|
|
salt/modules/rpm.py | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
diff --git a/salt/modules/rpm.py b/salt/modules/rpm.py
|
|
index cdf91a6..00cbd5d 100644
|
|
--- a/salt/modules/rpm.py
|
|
+++ b/salt/modules/rpm.py
|
|
@@ -485,6 +485,8 @@ def info(*packages, **attr):
|
|
if 'stderr' in call:
|
|
comment += (call['stderr'] or call['stdout'])
|
|
raise CommandExecutionError('{0}'.format(comment))
|
|
+ elif 'error' in call['stderr']:
|
|
+ raise CommandExecutionError(call['stderr'])
|
|
else:
|
|
out = call['stdout']
|
|
|
|
--
|
|
2.1.4
|
|
|