RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: lua rpm Date: 14-Mar-2016 21:32:25
Branch: rpm-5_4 Handle: 2016031420322401
Modified files: (Branch: rpm-5_4)
lua/tests/libs Makefile.am
rpm/rpmdb db3.c
Log:
- rpmdb: fix: disable DB_MULTIVERSION if non-root.
- distcheck: fix: clean up *.so after lua "make check".
Summary:
Revision Changes Path
1.1.2.3 +3 -1 lua/tests/libs/Makefile.am
1.156.2.24 +3 -0 rpm/rpmdb/db3.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: lua/tests/libs/Makefile.am
============================================================================
$ cvs diff -u -r1.1.2.2 -r1.1.2.3 Makefile.am
--- lua/tests/libs/Makefile.am 14 Mar 2016 06:28:17 -0000 1.1.2.2
+++ lua/tests/libs/Makefile.am 14 Mar 2016 20:32:25 -0000 1.1.2.3
@@ -28,7 +28,9 @@
all: P1 lib1.so lib11.so lib2.so lib21.so lib2-v2.so
clean:
- rm -f lib1.so lib11.so lib2.so lib21.so lib2-v2.so
+ rm -f *.so
+
+distclean: clean
lib1.so: $(srcdir)/lib1.c
$(CC) $(CFLAGS) -o lib1.so $<
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/db3.c
============================================================================
$ cvs diff -u -r1.156.2.23 -r1.156.2.24 db3.c
--- rpm/rpmdb/db3.c 13 Mar 2016 04:24:01 -0000 1.156.2.23
+++ rpm/rpmdb/db3.c 14 Mar 2016 20:32:24 -0000 1.156.2.24
@@ -982,6 +982,9 @@
/* XXX DB_RECOVER needs automagic */
if (!(eflags & DB_INIT_TXN)) eflags &= ~DB_RECOVER;
+ /* XXX DB_MULTIVERSION requires transactions, needs W_OK to rpmdb/__db*
*/
+ if (getuid() != 0) eflags &= ~DB_MULTIVERSION;
+
if (dbfile)
rpmlog(RPMLOG_DEBUG, D_("opening db environment %s/%s %s\n"),
dbhome, dbfile, prDbiOpenFlags(eflags, 1));
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
