* Tue Apr 14 2009 Dan Walsh <dwalsh@redhat.com> 2.0.62-10
- Do not print \n, if count < 1000;
This commit is contained in:
parent
a8ac23f196
commit
cdfce15287
@ -1029,3 +1029,41 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po
|
|||||||
if use_file:
|
if use_file:
|
||||||
ddict = self.get_all(locallist)
|
ddict = self.get_all(locallist)
|
||||||
keys = ddict.keys()
|
keys = ddict.keys()
|
||||||
|
Binary files nsapolicycoreutils/setfiles/restorecon and policycoreutils-2.0.62/setfiles/restorecon differ
|
||||||
|
Binary files nsapolicycoreutils/setfiles/setfiles and policycoreutils-2.0.62/setfiles/setfiles differ
|
||||||
|
diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/setfiles/setfiles.c policycoreutils-2.0.62/setfiles/setfiles.c
|
||||||
|
--- nsapolicycoreutils/setfiles/setfiles.c 2008-08-28 09:34:24.000000000 -0400
|
||||||
|
+++ policycoreutils-2.0.62/setfiles/setfiles.c 2009-04-14 09:38:55.000000000 -0400
|
||||||
|
@@ -29,6 +29,8 @@
|
||||||
|
static int mass_relabel;
|
||||||
|
static int mass_relabel_errs;
|
||||||
|
|
||||||
|
+#define STAR_COUNT 1000
|
||||||
|
+
|
||||||
|
static FILE *outfile = NULL;
|
||||||
|
static int force = 0;
|
||||||
|
#define STAT_BLOCK_SIZE 1
|
||||||
|
@@ -444,11 +446,11 @@
|
||||||
|
|
||||||
|
if (progress) {
|
||||||
|
count++;
|
||||||
|
- if (count % 80000 == 0) {
|
||||||
|
+ if (count % (80 * STAR_COUNT) == 0) {
|
||||||
|
fprintf(stdout, "\n");
|
||||||
|
fflush(stdout);
|
||||||
|
}
|
||||||
|
- if (count % 1000 == 0) {
|
||||||
|
+ if (count % STAR_COUNT == 0) {
|
||||||
|
fprintf(stdout, "*");
|
||||||
|
fflush(stdout);
|
||||||
|
}
|
||||||
|
@@ -1017,7 +1019,7 @@
|
||||||
|
free(excludeArray[i].directory);
|
||||||
|
}
|
||||||
|
|
||||||
|
- if (progress)
|
||||||
|
+ if (progress && count >= STAR_COUNT)
|
||||||
|
printf("\n");
|
||||||
|
exit(errors);
|
||||||
|
}
|
||||||
|
Binary files nsapolicycoreutils/setfiles/setfiles.o and policycoreutils-2.0.62/setfiles/setfiles.o differ
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
Summary: SELinux policy core utilities
|
Summary: SELinux policy core utilities
|
||||||
Name: policycoreutils
|
Name: policycoreutils
|
||||||
Version: 2.0.62
|
Version: 2.0.62
|
||||||
Release: 9%{?dist}
|
Release: 10%{?dist}
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
Group: System Environment/Base
|
Group: System Environment/Base
|
||||||
Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
|
Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
|
||||||
@ -221,6 +221,9 @@ else
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Apr 14 2009 Dan Walsh <dwalsh@redhat.com> 2.0.62-10
|
||||||
|
- Do not print \n, if count < 1000;
|
||||||
|
|
||||||
* Sat Apr 11 2009 Dan Walsh <dwalsh@redhat.com> 2.0.62-9
|
* Sat Apr 11 2009 Dan Walsh <dwalsh@redhat.com> 2.0.62-9
|
||||||
- Handle case where subs file does not exist
|
- Handle case where subs file does not exist
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user