Attachment 630004 Details for Bug 868287 – add a -q on the rpm

[patch] add a -q on the rpm

0001-fix-spurious-output-in-post-since-grep-is-not-silenc.patch (text/plain), 1.55 KB, created by Michael S. on 2012-10-19 12:28:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael S.

Created: 2012-10-19 12:28:00 UTC

Size: 1.55 KB

patch

obsolete

>From 667c2a775be1962b75c3a1a49404201368ea9dc4 Mon Sep 17 00:00:00 2001
>From: Michael Scherer <mscherer@redhat.com>
>Date: Fri, 19 Oct 2012 14:25:07 +0200
>Subject: [PATCH] fix spurious output in %post, since grep is not silenced, it
> will show /usr/bin/ss-trap-user upon upgrade
>
>---
> rubygem-openshift-origin-node.spec | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
>diff --git a/rubygem-openshift-origin-node.spec b/rubygem-openshift-origin-node.spec
>index ea6ef0c..74858ac 100644
>--- a/rubygem-openshift-origin-node.spec
>+++ b/rubygem-openshift-origin-node.spec
>@@ -14,7 +14,7 @@
> Summary:        Application container runtime for OpenShift
> Name:           rubygem-%{gem_name}
> Version:        0.14.6
>-Release:        6%{?dist}
>+Release:        7%{?dist}
> Group:          Development/Tools
> License:        ASL 2.0
> URL:            http://openshift.redhat.com
>@@ -131,7 +131,7 @@ chmod 0644 %{buildroot}%{gem_dir}/gems/%{gem_name}-%{version}/lib/stickshift-nod
> %post
> if [ $1 -ge 1 ] ; then # Handle first install and upgrade
>     # No need to add this again if we're upgrading
>-    grep ss-trap-user /etc/shells
>+    grep -q ss-trap-user /etc/shells
>     [ $? -ne 0 ] && echo "/usr/bin/ss-trap-user" >> /etc/shells
> 
>     restorecon -r %{_var}/lib/stickshift
>@@ -145,6 +145,9 @@ if [ $1 -eq 0 ] ; then # Final removal
> fi
> 
> %changelog
>+* Fri Oct 19 2012 Michael Scherer <misc@fedoraproject.org> 0.14.6-7
>+- fix spurious output in %post
>+ 
> * Tue Oct 16 2012 Troy Dawson <tdawson@redhat.com> 0.14.6-6
> - Fixed 000001_stickshift_node.conf httpd 2.4 issues
> 
>-- 
>1.7.12.1
>

Actions: View | Diff

Attachments on bug 868287: 630004