RPM Package Manager, CVS Repository http://rpm5.org/cvs/ ____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: rpm Date: 10-May-2016 19:05:14 Branch: rpm-5_4 Handle: 2016051017051400 Modified files: (Branch: rpm-5_4) rpm/rpmdb db3.c pkgio.c Log: - fix: strip DB_MULTIVERSION for non-root rpmdb opens. Summary: Revision Changes Path 1.156.2.28 +1 -0 rpm/rpmdb/db3.c 1.121.2.27 +1 -1 rpm/rpmdb/pkgio.c ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/rpmdb/db3.c ============================================================================ $ cvs diff -u -r1.156.2.27 -r1.156.2.28 db3.c --- rpm/rpmdb/db3.c 8 May 2016 18:33:29 -0000 1.156.2.27 +++ rpm/rpmdb/db3.c 10 May 2016 17:05:14 -0000 1.156.2.28 @@ -2402,6 +2402,7 @@ /* dbhome is unwritable, don't attempt DB_CREATE on DB->open ... */ oflags &= ~DB_CREATE; oflags &= ~DB_AUTO_COMMIT; + oflags &= ~DB_MULTIVERSION; /* ... but DBENV->open might still need DB_CREATE ... */ if (dbi->dbi_eflags & DB_PRIVATE) { @@ . patch -p0 <<'@@ .' Index: rpm/rpmdb/pkgio.c ============================================================================ $ cvs diff -u -r1.121.2.26 -r1.121.2.27 pkgio.c --- rpm/rpmdb/pkgio.c 24 Apr 2016 18:13:22 -0000 1.121.2.26 +++ rpm/rpmdb/pkgio.c 10 May 2016 17:05:14 -0000 1.121.2.27 @@ -100,7 +100,7 @@ *msg = (nb > 0 ? xstrdup(_("short write of header")) : xstrdup(Fstrerror(fd)) ); - goto exit; + goto exit; } rc = RPMRC_OK; @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository rpm-cvs@rpm5.org