rpms/coreutils
7
0
Fork 0
Code Issues Pull Requests Releases Activity

fix issue with df --direct(extra new line)

Browse Source
This commit is contained in:
Ondřej Vašík 2011-04-14 16:51:54 +02:00
parent 575258689b
commit d79f57cc32
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
coreutils-df-direct.patch
View File

@ -52,7 +52,7 @@ diff -urNp coreutils-8.11-orig/src/df.c coreutils-8.11/src/df.c
- char const *header = _(headers[field][header_mode]); - char const *header = _(headers[field][header_mode]);
+ +
+ char const *header = (field == MNT_FIELD && direct_statfs)? + char const *header = (field == MNT_FIELD && direct_statfs)?
+ _("File\n") : + _("File") :
+ _(headers[field][header_mode]); + _(headers[field][header_mode]);
+ +
if (!header) if (!header)
@ -157,14 +157,14 @@ diff -urNp coreutils-8.11-orig/tests/df/direct coreutils-8.11/tests/df/direct
+compare header_file_out header_file_exp || fail=1 +compare header_file_out header_file_exp || fail=1
+ +
+# check df output (without --direct) +# check df output (without --direct)
+#$AWK '{ if (NR==2) print $6; }' df_out > file_out \ +$AWK '{ if (NR==2) print $6; }' df_out > file_out \
+# || framework_failure + || framework_failure
+#compare file_out file_exp && fail=1 +compare file_out file_exp && fail=1
+ +
+# check df output (with --direct) +# check df output (with --direct)
+#$AWK '{ if (NR==2) print $6; }' df_direct_out > file_out \ +$AWK '{ if (NR==2) print $6; }' df_direct_out > file_out \
+# || framework_failure + || framework_failure
+#compare file_out file_exp || fail=1 +compare file_out file_exp || fail=1
+ +
+Exit $fail +Exit $fail
diff -urNp coreutils-8.11-orig/tests/Makefile.am coreutils-8.11/tests/Makefile.am diff -urNp coreutils-8.11-orig/tests/Makefile.am coreutils-8.11/tests/Makefile.am

5
coreutils.spec
View File

@ -1,7 +1,7 @@
Summary: A set of basic GNU tools commonly used in shell scripts Summary: A set of basic GNU tools commonly used in shell scripts
Name: coreutils Name: coreutils
Version: 8.11 Version: 8.11
Release: 1%{?dist} Release: 2%{?dist}
License: GPLv3+ License: GPLv3+
Group: System Environment/Base Group: System Environment/Base
Url: http://www.gnu.org/software/coreutils/ Url: http://www.gnu.org/software/coreutils/
@ -332,6 +332,9 @@ fi
%{_libdir}/coreutils %{_libdir}/coreutils
%changelog %changelog
* Thu Apr 14 2011 Ondrej Vasik <ovasik@redhat.com> - 8.11-2
- fix issue with df --direct(extra new line)
* Thu Apr 14 2011 Ondrej Vasik <ovasik@redhat.com> - 8.11-1 * Thu Apr 14 2011 Ondrej Vasik <ovasik@redhat.com> - 8.11-1
- new upstream release 8.11, defuzz patches - new upstream release 8.11, defuzz patches