RPM Package Manager, CVS Repository http://rpm5.org/cvs/ ____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: [EMAIL PROTECTED] Module: rpm lua Date: 17-Nov-2008 15:21:15 Branch: HEAD Handle: 2008111714211401 Modified files: lua/chkconfig chkconfig.c lua/shadow groupadd.c useradd.c rpm CHANGES Log: - WR: lua: display "rpm:lua:foo" progname w chkconfig/useradd/groupadd errors. Summary: Revision Changes Path 1.3 +2 -2 lua/chkconfig/chkconfig.c 1.5 +2 -2 lua/shadow/groupadd.c 1.6 +2 -2 lua/shadow/useradd.c 1.2652 +2 -0 rpm/CHANGES ____________________________________________________________________________ patch -p0 <<'@@ .' Index: lua/chkconfig/chkconfig.c ============================================================================ $ cvs diff -u -r1.2 -r1.3 chkconfig.c --- lua/chkconfig/chkconfig.c 18 Aug 2008 19:16:10 -0000 1.2 +++ lua/chkconfig/chkconfig.c 17 Nov 2008 14:21:15 -0000 1.3 @@ -27,7 +27,7 @@ #include <sys/stat.h> #include <unistd.h> -static const char *progname; +static const char *progname = "rpm:lua:chkconfig"; #define _(String) gettext((String)) @@ -579,6 +579,7 @@ { 0, 0, 0, 0, 0 } }; +#if 0 if ((progname = strrchr(argv[0], '/')) != NULL) progname++; else @@ -592,7 +593,6 @@ LSB++; } -#if 0 setlocale(LC_ALL, ""); bindtextdomain("chkconfig","/usr/share/locale"); textdomain("chkconfig"); @@ . patch -p0 <<'@@ .' Index: lua/shadow/groupadd.c ============================================================================ $ cvs diff -u -r1.4 -r1.5 groupadd.c --- lua/shadow/groupadd.c 18 Aug 2008 19:16:10 -0000 1.4 +++ lua/shadow/groupadd.c 17 Nov 2008 14:21:14 -0000 1.5 @@ -36,7 +36,7 @@ #include "system.h" #include "shadow_config.h" -#ident "$Id: groupadd.c,v 1.4 2008/08/18 19:16:10 jbj Exp $" +#ident "$Id: groupadd.c,v 1.5 2008/11/17 14:21:14 jbj Exp $" #include <ctype.h> #include <fcntl.h> @@ -85,7 +85,7 @@ static gid_t group_id; static char *empty_list = NULL; -static char *Prog; +static char *Prog = "rpm:lua:wrs.groupadd"; static int oflg = 0; /* permit non-unique group ID to be specified with -g */ static int gflg = 0; /* ID value for the new group */ @@ . patch -p0 <<'@@ .' Index: lua/shadow/useradd.c ============================================================================ $ cvs diff -u -r1.5 -r1.6 useradd.c --- lua/shadow/useradd.c 27 Oct 2008 00:38:26 -0000 1.5 +++ lua/shadow/useradd.c 17 Nov 2008 14:21:14 -0000 1.6 @@ -36,7 +36,7 @@ #include "system.h" #include "shadow_config.h" -#ident "$Id: useradd.c,v 1.5 2008/10/27 00:38:26 jbj Exp $" +#ident "$Id: useradd.c,v 1.6 2008/11/17 14:21:14 jbj Exp $" #include <getopt.h> #include <grp.h> @@ -117,7 +117,7 @@ static long sys_ngroups; static int do_grp_update = 0; /* group files need to be updated */ -static char *Prog; +static char *Prog = "rpm:lua:wrs.useradd"; static int bflg = 0, /* new default root of home directory */ @@ . patch -p0 <<'@@ .' Index: rpm/CHANGES ============================================================================ $ cvs diff -u -r1.2651 -r1.2652 CHANGES --- rpm/CHANGES 17 Nov 2008 14:12:52 -0000 1.2651 +++ rpm/CHANGES 17 Nov 2008 14:21:14 -0000 1.2652 @@ -1,5 +1,7 @@ 5.2a2 -> 5.2a3: + - jbj: WR: lua: display "rpm:lua:foo" progname w chkconfig/useradd/groupadd + errors. - jbj: WR: fix: sqlite assertion failure while sequentially retrieving keys. - bero: Ark: create --with-vendor=ark, borrow some Mandriva patches, add use-gnu-tar-compression-detection patch for vendor ark @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository rpm-cvs@rpm5.org