[policycoreutils] Don't be verbose in fixfiles if there is not tty

Daniel J Walsh dwalsh at fedoraproject.org
Fri Feb 14 17:32:54 UTC 2014


commit f17032379c302c5b7c08fac0fd8972fdc6845299
Author: Dan Walsh <dwalsh at redhat.com>
Date:   Fri Feb 14 12:33:24 2014 -0500

    Don't be verbose in fixfiles if there is not tty

 policycoreutils-rhat.patch |   12 ++++++++++++
 policycoreutils.spec       |    5 ++++-
 2 files changed, 16 insertions(+), 1 deletions(-)
---
diff --git a/policycoreutils-rhat.patch b/policycoreutils-rhat.patch
index b62c61a..aaa61b0 100644
--- a/policycoreutils-rhat.patch
+++ b/policycoreutils-rhat.patch
@@ -657375,6 +657375,18 @@ index fb5a24c..3668abe 100644
                 
          if self.__options.setype:
                 self.setype = self.__options.setype
+diff --git a/policycoreutils/scripts/fixfiles b/policycoreutils/scripts/fixfiles
+index 5c29eb9..75d3c8d 100755
+--- a/policycoreutils/scripts/fixfiles
++++ b/policycoreutils/scripts/fixfiles
+@@ -116,6 +116,7 @@ exclude_dirs() {
+ fullFlag=0
+ BOOTTIME=""
+ VERBOSE="-p"
++[ -t 1 ] || VERBOSE=""
+ FORCEFLAG=""
+ DIRS=""
+ RPMILES=""
 diff --git a/policycoreutils/semanage/Makefile b/policycoreutils/semanage/Makefile
 index 8fc8e0b..9bb4f24 100644
 --- a/policycoreutils/semanage/Makefile
diff --git a/policycoreutils.spec b/policycoreutils.spec
index 71f8d35..c1a2e5d 100644
--- a/policycoreutils.spec
+++ b/policycoreutils.spec
@@ -7,7 +7,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.2.5
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2
 Group:	 System Environment/Base
 # Based on git repository with tag 20101221
@@ -383,6 +383,9 @@ The policycoreutils-restorecond package contains the restorecond service.
 %systemd_postun_with_restart restorecond.service
 
 %changelog
+* Fri Feb 14 2014 Dan Walsh <dwalsh at redhat.com> - 2.2.5-6
+- Don't be verbose in fixfiles if there is not tty
+
 * Thu Feb 13 2014 Dan Walsh <dwalsh at redhat.com> - 2.2.5-5
 - Yum should only be required for policycoreutils-devel
 


More information about the scm-commits mailing list