rpms/coreutils/devel coreutils-6.10-verbose.patch, 1.1, 1.2 coreutils-colorls.csh, 1.10, 1.11 coreutils.spec, 1.196, 1.197
Ondrej Vasik (ovasik)
fedora-extras-commits at redhat.com
Tue Mar 4 12:04:35 UTC 2008
- Previous message (by thread): rpms/hal/F-8 hal-0.5.10-acltool-serialize.patch, NONE, 1.1 hal.spec, 1.139, 1.140 hal-0.5.10-ck-acl.patch, 1.1, NONE
- Next message (by thread): rpms/cups/devel cups.spec, 1.398, 1.399 cups-1.1.15-initscript.patch, 1.9, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: ovasik
Update of /cvs/extras/rpms/coreutils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26365
Modified Files:
coreutils-6.10-verbose.patch coreutils-colorls.csh
coreutils.spec
Log Message:
colorls csh missing doublequotes + fixed localization of verbose stdout outputs
coreutils-6.10-verbose.patch:
Index: coreutils-6.10-verbose.patch
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-6.10-verbose.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- coreutils-6.10-verbose.patch 3 Mar 2008 14:00:19 -0000 1.1
+++ coreutils-6.10-verbose.patch 4 Mar 2008 12:04:31 -0000 1.2
@@ -21,7 +21,7 @@
@item -x
@itemx --exact
diff --git a/src/install.c b/src/install.c
-index db08751..95e37fc 100644
+index db08751..6925c55 100644
--- a/src/install.c
+++ b/src/install.c
@@ -1,5 +1,5 @@
@@ -31,17 +31,37 @@
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-@@ -762,7 +762,7 @@ announce_mkdir (char const *dir, void *options)
+@@ -160,6 +160,19 @@ static struct option const long_options[] =
+ {NULL, 0, NULL, 0}
+ };
+
++/* Verbose formatted output of variable count of arguments. */
++static void
++verbose_output (FILE *fp, char const *fmt, ...)
++{
++ va_list ap;
++ fputs (program_name, fp);
++ fputs (": ", fp);
++ va_start (ap, fmt);
++ vfprintf (fp, fmt, ap);
++ va_end (ap);
++ fputc ('\n', fp);
++}
++
+ static void
+ cp_option_init (struct cp_options *x)
+ {
+@@ -762,7 +775,7 @@ announce_mkdir (char const *dir, void *options)
{
struct cp_options const *x = options;
if (x->verbose)
- error (0, 0, _("creating directory %s"), quote (dir));
-+ printf (_("%s: creating directory %s\n"), program_name, quote (dir));
++ verbose_output (stdout,_("creating directory %s"), quote (dir));
}
/* Make ancestor directory DIR, whose last file name component is
diff --git a/src/rmdir.c b/src/rmdir.c
-index bb1a0c8..609c387 100644
+index bb1a0c8..1f17f6a 100644
--- a/src/rmdir.c
+++ b/src/rmdir.c
@@ -1,6 +1,6 @@
@@ -52,21 +72,41 @@
Foundation, Inc.
This program is free software: you can redistribute it and/or modify
-@@ -134,7 +134,7 @@ remove_parents (char *dir)
+@@ -72,6 +72,19 @@ static struct option const longopts[] =
+ {NULL, 0, NULL, 0}
+ };
+
++/* Verbose formatted output of variable count of arguments. */
++static void
++verbose_output (FILE *fp, char const *fmt, ...)
++{
++ va_list ap;
++ fputs (program_name, fp);
++ fputs (": ", fp);
++ va_start (ap, fmt);
++ vfprintf (fp, fmt, ap);
++ va_end (ap);
++ fputc ('\n', fp);
++}
++
+ /* Return true if ERROR_NUMBER is one of the values associated
+ with a failed rmdir due to non-empty target directory. */
+ static bool
+@@ -134,7 +147,7 @@ remove_parents (char *dir)
/* Give a diagnostic for each attempted removal if --verbose. */
if (verbose)
- error (0, 0, _("removing directory, %s"), quote (dir));
-+ printf(_("%s: removing directory, %s\n"), program_name, quote (dir));
++ verbose_output (stdout,_("removing directory, %s"), quote (dir));
ok = (rmdir (dir) == 0);
-@@ -233,7 +233,7 @@ main (int argc, char **argv)
+@@ -233,7 +246,7 @@ main (int argc, char **argv)
/* Give a diagnostic for each attempted removal if --verbose. */
if (verbose)
- error (0, 0, _("removing directory, %s"), dir);
-+ printf(_("%s: removing directory, %s\n"), program_name, dir);
++ verbose_output(stdout, _("removing directory, %s"), dir);
if (rmdir (dir) != 0)
{
Index: coreutils-colorls.csh
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-colorls.csh,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- coreutils-colorls.csh 18 Feb 2008 14:37:04 -0000 1.10
+++ coreutils-colorls.csh 4 Mar 2008 12:04:31 -0000 1.11
@@ -1,7 +1,7 @@
#! /bin/csh -f
# color-ls initialization
if ( $?LS_COLORS ) then
- if ( $LS_COLORS != "" ) then
+ if ( "$LS_COLORS" != "" ) then
#do not override user specified LS_COLORS and use them
goto finish
endif
Index: coreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils.spec,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -r1.196 -r1.197
--- coreutils.spec 3 Mar 2008 14:00:19 -0000 1.196
+++ coreutils.spec 4 Mar 2008 12:04:31 -0000 1.197
@@ -1,7 +1,7 @@
Summary: The GNU core utilities: a set of tools commonly used in shell scripts
Name: coreutils
Version: 6.10
-Release: 9%{?dist}
+Release: 10%{?dist}
License: GPLv3+
Group: System Environment/Base
Url: http://www.gnu.org/software/coreutils/
@@ -18,7 +18,7 @@
Source203: coreutils-runuser-l.pamd
# From upstream
-Patch1:coreutils-6.10-verbose.patch
+Patch1: coreutils-6.10-verbose.patch
# Our patches
Patch100: coreutils-chgrp.patch
@@ -293,6 +293,10 @@
/sbin/runuser
%changelog
+* Tue Mar 4 2008 Ondrej Vasik <ovasik at redhat.com> - 6.10-10
+- colorls.csh missing doublequotes (#435789)
+- fixed possibility to localize verbose outputs
+
* Mon Mar 3 2008 Ondrej Vasik <ovasik at redhat.com> - 6.10-9
- consolidation of verbose output to stdout (upstream)
- Previous message (by thread): rpms/hal/F-8 hal-0.5.10-acltool-serialize.patch, NONE, 1.1 hal.spec, 1.139, 1.140 hal-0.5.10-ck-acl.patch, 1.1, NONE
- Next message (by thread): rpms/cups/devel cups.spec, 1.398, 1.399 cups-1.1.15-initscript.patch, 1.9, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list