[node-patches] Change in ovirt-node[master]: Patch sos-3.2 on python 2.6 as well

rbarry at redhat.com rbarry at redhat.com
Fri Jun 19 15:05:05 UTC 2015


Ryan Barry has uploaded a new change for review.

Change subject: Patch sos-3.2 on python 2.6 as well
......................................................................

Patch sos-3.2 on python 2.6 as well

Match 2.6 and 2.7, so we can start combining necessary patches to
keep up with sos on el7 and el6 in one places. This also makes
sosreport work on 6.7-based images.

Change-Id: Ic0fd6126d385fc6f290726d88f560d0ecfdfaa77
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1232229
Signed-off-by: Ryan Barry <rbarry at redhat.com>
---
M recipe/common-post.ks
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/82/42582/1

diff --git a/recipe/common-post.ks b/recipe/common-post.ks
index 4f765ea..d41dd17 100644
--- a/recipe/common-post.ks
+++ b/recipe/common-post.ks
@@ -231,7 +231,7 @@
 echo "use .pyc for plugins enumeration, .py is blacklisted"
 # include *-release
 if [[ $(rpm -q sos) =~ sos-3.2 ]]; then
-patch --fuzz 3 -d /usr/lib/python2.7/site-packages/sos -p2 <<  \EOF_sos_patch
+patch --fuzz 3 -d /usr/lib/python2.?/site-packages/sos -p2 <<  \EOF_sos_patch
 index 341d268..51883fa 100644
 --- a/sos/plugins/general.py
 +++ b/sos/plugins/general.py


-- 
To view, visit https://gerrit.ovirt.org/42582
To unsubscribe, visit https://gerrit.ovirt.org/settings

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



More information about the node-patches mailing list