RPM Package Manager, CVS Repository http://rpm5.org/cvs/ ____________________________________________________________________________
Server: rpm5.org Name: Elan Ruusamäe Root: /v/rpm/cvs Email: [email protected] Module: rpm Date: 17-Oct-2009 14:00:18 Branch: rpm-4_5 Handle: 2009101712001502 Modified files: (Branch: rpm-4_5) rpm CHANGES rpm/rpmdb rpmdb.c Log: - fix --root --rebuilddb (merge from r8637) Summary: Revision Changes Path 1.1360.2.143+1 -0 rpm/CHANGES 1.128.2.11 +1 -1 rpm/rpmdb/rpmdb.c ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/CHANGES ============================================================================ $ cvs diff -u -r1.1360.2.142 -r1.1360.2.143 CHANGES --- rpm/CHANGES 17 Oct 2009 11:54:45 -0000 1.1360.2.142 +++ rpm/CHANGES 17 Oct 2009 12:00:15 -0000 1.1360.2.143 @@ -1,4 +1,5 @@ 4.4.9 -> 4.5: + - glen: fix --root --rebuilddb (merge from r8637) - glen: kill warnings about calling function without prototype (qbo...@pld) - glen: correct pl/rpm.8: missing --test (an...@pld) - glen: scan AC_PROG_CXX to be able to set __cpp macro @@ . patch -p0 <<'@@ .' Index: rpm/rpmdb/rpmdb.c ============================================================================ $ cvs diff -u -r1.128.2.10 -r1.128.2.11 rpmdb.c --- rpm/rpmdb/rpmdb.c 4 Jun 2009 23:09:36 -0000 1.128.2.10 +++ rpm/rpmdb/rpmdb.c 17 Oct 2009 12:00:17 -0000 1.128.2.11 @@ -3934,7 +3934,7 @@ } dbpath = rootdbpath = rpmGetPath(prefix, tfn, NULL); if (!(prefix[0] == '/' && prefix[1] == '\0')) - dbpath += strlen(prefix) - 1; + dbpath += strlen(prefix); tfn = _free(tfn); /*...@-nullpass@*/ @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository [email protected]
