rpms/bind/devel bind.spec,1.327,1.328 named.init,1.74,1.75

Adam Tkac atkac at fedoraproject.org
Mon Sep 21 10:38:47 UTC 2009


Author: atkac

Update of /cvs/pkgs/rpms/bind/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2898

Modified Files:
	bind.spec named.init 
Log Message:
- determine file size via `stat` instead of `ls` (#523682)



Index: bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/bind.spec,v
retrieving revision 1.327
retrieving revision 1.328
diff -u -p -r1.327 -r1.328
--- bind.spec	16 Sep 2009 11:09:12 -0000	1.327
+++ bind.spec	21 Sep 2009 10:38:47 -0000	1.328
@@ -20,7 +20,7 @@ Summary:  The Berkeley Internet Name Dom
 Name:     bind
 License:  ISC
 Version:  9.7.0
-Release:  0.3.%{PREVER}%{?dist}
+Release:  0.4.%{PREVER}%{?dist}
 Epoch:    32
 Url:      http://www.isc.org/products/BIND/
 Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -595,6 +595,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %ghost %{chroot_prefix}/etc/localtime
 
 %changelog
+* Mon Sep 21 2009 Adam Tkac <atkac redhat com> 32:9.7.0-0.4.a3
+- determine file size via `stat` instead of `ls` (#523682)
+
 * Wed Sep 16 2009 Adam Tkac <atkac redhat com> 32:9.7.0-0.3.a3
 - update to 9.7.0a3
 


Index: named.init
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/named.init,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- named.init	15 Sep 2009 15:34:00 -0000	1.74
+++ named.init	21 Sep 2009 10:38:47 -0000	1.75
@@ -76,8 +76,7 @@ mount_chroot_conf()
       # If mount source is a file
       if ! [ -d "$all" ]; then
         # mount it only if it is not present in chroot or it is empty
-        if ! [ -e "$ROOTDIR$all" ] ||
-           [ `ls -s "$ROOTDIR$all" | awk '{ print $1 };'` -eq 0 ]; then
+        if ! [ -e "$ROOTDIR$all" ] || [ `stat -c'%s' "$ROOTDIR$all"` -eq 0 ]; then
           touch "$ROOTDIR$all"
           mount --bind "$all" "$ROOTDIR$all"
         fi




More information about the scm-commits mailing list