RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 18-Jun-2007 19:38:38
Branch: HEAD Handle: 2007061818383800
Modified files:
rpm/rpmio rpmlua.c
Log:
(optional) initialize lua from _rpmhome, not _usrlibrpm.
Summary:
Revision Changes Path
2.14 +3 -3 rpm/rpmio/rpmlua.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmlua.c
============================================================================
$ cvs diff -u -r2.13 -r2.14 rpmlua.c
--- rpm/rpmio/rpmlua.c 25 May 2007 17:36:36 -0000 2.13
+++ rpm/rpmio/rpmlua.c 18 Jun 2007 17:38:38 -0000 2.14
@@ -76,12 +76,12 @@
/[EMAIL PROTECTED]@*/
lua_settop(L, 0);
}
-#define _LUADOTDIR "%{?_usrlibrpm}%{!?_usrlibrpm:" USRLIBRPM "}"
+#define _LUADOTDIR "%{?_rpmhome}%{!?_rpmhome:" USRLIBRPM "/"
VERSION "}"
{ const char * _lua_path = rpmGetPath(_LUADOTDIR, "/lua/?.lua",
NULL);
if (_lua_path != NULL) {
lua_pushliteral(L, "LUA_PATH");
lua_pushstring(L, _lua_path);
- free(_lua_path);
+ _lua_path = _free(_lua_path);
}
}
lua_rawset(L, LUA_GLOBALSINDEX);
@@ -94,7 +94,7 @@
struct stat st;
if (Stat(_lua_init, &st) != -1)
(void)rpmluaRunScriptFile(lua, _lua_init);
- free(_lua_init);
+ _lua_init = _free(_lua_init);
}
}
#undef _LUADOTDIR
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
