[node-patches] Change in ovirt-node[master]: Use updated sosreport patches for EL7 as well

[rbarry at redhat.com]

Ryan Barry has uploaded a new change for review.

Change subject: Use updated sosreport patches for EL7 as well
......................................................................

Use updated sosreport patches for EL7 as well

EL7 has updated sosreport. Patch it correctly.

Change-Id: Ia1092b468a8806bcfb78a5ef75dab96ec8128a75
Signed-off-by: Ryan Barry <rbarry at redhat.com>
---
M recipe/common-post.ks
1 file changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/60/30660/1

diff --git a/recipe/common-post.ks b/recipe/common-post.ks
index 9abb456..1ad2243 100644
--- a/recipe/common-post.ks
+++ b/recipe/common-post.ks
@@ -176,7 +176,9 @@
 # sosreport fixups for node image:
 # use .pyc for plugins enumeration, .py is blacklisted
 # include *-release
-if [[ $(rpm -E "%{?fedora}") = 20 ]];then
+if [[ $(rpm -E "%{?fedora}") = 20 ]] ||
+    [[ $(rpm -E "%{?rhel}") = 7 ]] ||
+    [[ $(rpm -E "%{?centos}" = 7 ]]; then
 patch --fuzz 3 -d /usr/lib/python2.7/site-packages/sos -p0 <<  \EOF_sos_patch
 --- utilities.py.orig    2013-08-04 08:36:51.000000000 -0700
 +++ utilities.py   2014-03-18 15:25:02.675059445 -0700


-- 
To view, visit http://gerrit.ovirt.org/30660
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia1092b468a8806bcfb78a5ef75dab96ec8128a75
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Ryan Barry <rbarry at redhat.com>