[prev in list] [next in list] [prev in thread] [next in thread] 

List:       rpm-cvs
Subject:    [CVS] RPM: rpm/ CHANGES rpm/lib/ rpmrc.c rpm/rpmio/ librpmio.vers rpml...
From:       "Jeff Johnson" <jbj () rpm5 ! org>
Date:       2008-10-27 4:05:22
Message-ID: 20081027040522.18F5FA6EA7 () rpm5 ! org
[Download RAW message or body]

  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Jeff Johnson
  Root:   /v/rpm/cvs                       Email:  jbj@rpm5.org
  Module: rpm                              Date:   27-Oct-2008 05:05:22
  Branch: HEAD                             Handle: 2008102704052100

  Modified files:
    rpm                     CHANGES
    rpm/lib                 rpmrc.c
    rpm/rpmio               librpmio.vers rpmlua.c rpmlua.h

  Log:
    - jbj: lua: display rudimentary info about lua with --showrc.

  Summary:
    Revision    Changes     Path
    1.2630      +1  -0      rpm/CHANGES
    2.248       +14 -1      rpm/lib/rpmrc.c
    2.77        +2  -0      rpm/rpmio/librpmio.vers
    2.59        +6  -3      rpm/rpmio/rpmlua.c
    2.14        +6  -0      rpm/rpmio/rpmlua.h
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.2629 -r1.2630 CHANGES
  --- rpm/CHANGES	27 Oct 2008 03:01:37 -0000	1.2629
  +++ rpm/CHANGES	27 Oct 2008 04:05:21 -0000	1.2630
  @@ -1,5 +1,6 @@
   
   5.2a2 -> 5.2a3:
  +    - jbj: lua: display rudimentary info about lua with --showrc.
       - jbj: lua: preload "crypto" in rpmlua.c.
       - jbj: lua: lom.lua has requires("lxp"), so preload "lxp" in rpmlua.c.
       - jbj: WRlua: preserve forward linkage by avoiding vmefail/get_date.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/rpmrc.c
  ============================================================================
  $ cvs diff -u -r2.247 -r2.248 rpmrc.c
  --- rpm/lib/rpmrc.c	22 Aug 2008 04:45:44 -0000	2.247
  +++ rpm/lib/rpmrc.c	27 Oct 2008 04:05:21 -0000	2.248
  @@ -1010,10 +1010,23 @@
       {	const char * s = rpmExpand("%{?optflags}", NULL);
   	fprintf(fp, "%-21s : %s\n", "optflags", ((s && *s) ? s : "(not set)"));
   	s = _free(s);
  +
  +	fprintf(fp, "\nLUA MODULES:\n");
   /*@-globs@*/
  -	s = rpmExpand(rpmMacrofiles, NULL);
  +	s = rpmExpand(rpmluaFiles, NULL);
  +/*@=globs@*/
  +	fprintf(fp, "%-21s : %s\n", "luafiles", ((s && *s) ? s : "(not set)"));
  +	s = _free(s);
  +/*@-globs@*/
  +	s = rpmExpand(rpmluaPath, NULL);
   /*@=globs@*/
  +	fprintf(fp, "%-21s : %s\n", "luapath", ((s && *s) ? s : "(not set)"));
  +	s = _free(s);
  +
   	fprintf(fp, "\nMACRO DEFINITIONS:\n");
  +/*@-globs@*/
  +	s = rpmExpand(rpmMacrofiles, NULL);
  +/*@=globs@*/
   	fprintf(fp, "%-21s : %s\n", "macrofiles", ((s && *s) ? s : "(not set)"));
   	s = _free(s);
       }
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/librpmio.vers
  ============================================================================
  $ cvs diff -u -r2.76 -r2.77 librpmio.vers
  --- rpm/rpmio/librpmio.vers	22 Sep 2008 01:56:35 -0000	2.76
  +++ rpm/rpmio/librpmio.vers	27 Oct 2008 04:05:21 -0000	2.77
  @@ -337,6 +337,8 @@
       rpmlogGetCallback;
       rpmlogSetFile;
       rpmlogSetMask;
  +    rpmluaFiles;
  +    rpmluaPath;
       rpmluaCheckScript;
       rpmluaDelVar;
       rpmluaFiles;
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmlua.c
  ============================================================================
  $ cvs diff -u -r2.58 -r2.59 rpmlua.c
  --- rpm/rpmio/rpmlua.c	27 Oct 2008 03:01:37 -0000	2.58
  +++ rpm/rpmio/rpmlua.c	27 Oct 2008 04:05:21 -0000	2.59
  @@ -59,7 +59,10 @@
   	/*@modifies L, fileSystem @*/;
   
   /*@unchecked@*/
  -const char *rpmluaFiles = RPMLUAFILES;
  +const char * rpmluaFiles = RPMLUAFILES;
  +
  +/*@unchecked@*/
  +const char * rpmluaPath = "%{?_rpmhome}%{!?_rpmhome:" USRLIBRPM "}/lua/?.lua";
   
   rpmlua rpmluaGetGlobalState(void)
   {
  @@ -114,8 +117,8 @@
   	lua_call(L, 1, 0);
   /*@=noeffectuncon@*/
       }
  -    {	const char * _lua_path = rpmGetPath("%{?_rpmhome}%{!?_rpmhome:" USRLIBRPM \
                "}", "/lua/?.lua", NULL);
  -	if (_lua_path != NULL) {
  +    {	const char * _lua_path = rpmGetPath(rpmluaPath, NULL);
  + 	if (_lua_path != NULL) {
   	    lua_pushliteral(L, "LUA_PATH");
   	    lua_pushstring(L, _lua_path);
   	    _lua_path = _free(_lua_path);
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmlua.h
  ============================================================================
  $ cvs diff -u -r2.13 -r2.14 rpmlua.h
  --- rpm/rpmio/rpmlua.h	2 Aug 2008 22:37:39 -0000	2.13
  +++ rpm/rpmio/rpmlua.h	27 Oct 2008 04:05:21 -0000	2.14
  @@ -47,6 +47,12 @@
   extern "C" {
   #endif
   
  +/*@unchecked@*/
  +extern const char * rpmluaFiles;
  +
  +/*@unchecked@*/
  +extern const char * rpmluaPath;
  +
   /*@-exportlocal@*/
   /*@only@*/ /*@exposed@*/ /*@relnull@*/
   rpmlua rpmluaGetGlobalState(void)
  @@ .
______________________________________________________________________
RPM Package Manager                                    http://rpm5.org
CVS Sources Repository                                rpm-cvs@rpm5.org


[prev in list] [next in list] [prev in thread] [next in thread]