RPM Package Manager, CVS Repository
  /cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Jeff Johnson
  Root:   /v/rpm/cvs                       Email:  jbj@rpm5.org
  Module: rpm                              Date:   29-Sep-2010 04:07:51
  Branch: rpm-5_3                          Handle: 2010092902075000

  Modified files:           (Branch: rpm-5_3)
    rpm                     CHANGES
    rpm/lib                 rpmts.c

  Log:
    - solvedb's never need a chroot prefix.

  Summary:
    Revision    Changes     Path
    1.3296.2.84 +1  -0      rpm/CHANGES
    2.181.2.7   +7  -2      rpm/lib/rpmts.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.3296.2.83 -r1.3296.2.84 CHANGES
  --- rpm/CHANGES	28 Sep 2010 00:08:02 -0000	1.3296.2.83
  +++ rpm/CHANGES	29 Sep 2010 02:07:50 -0000	1.3296.2.84
  @@ -1,4 +1,5 @@
   5.3.4 -> 5.3.5:
  +    - jbj: solvedb's never need a chroot prefix.
   
   5.3.3 -> 5.3.4:
       - jbj: release 5.3.4.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/rpmts.c
  ============================================================================
  $ cvs diff -u -r2.181.2.6 -r2.181.2.7 rpmts.c
  --- rpm/lib/rpmts.c	18 Sep 2010 18:25:05 -0000	2.181.2.6
  +++ rpm/lib/rpmts.c	29 Sep 2010 02:07:50 -0000	2.181.2.7
  @@ -250,6 +250,11 @@
       rpmdb sdb = NULL;
       int sdbmode = O_RDONLY;
       const char * s = NULL;
  +#ifdef	DYING	/* XXX solevedb's never need chroot prefix. */
  +    const char * rootDir = ts->rootDir;
  +#else
  +    const char * rootDir = "/";
  +#endif
       ARGV_t av = NULL;
       int ac = 0;
       int rc = 0;
  @@ -295,11 +300,11 @@
   
   	/* XXX Lstat(fn, &sb) to ensure a directory? */
   	addMacro(NULL, "_dbpath", NULL, fn, RMIL_DEFAULT);
  -	xx = rpmdbOpen(ts->rootDir, &sdb, dbmode, (mode_t)0644);
  +	xx = rpmdbOpen(rootDir, &sdb, dbmode, (mode_t)0644);
   	delMacro(NULL, "_dbpath");
   
   	if (xx) {
  -	    const char * dn = rpmGetPath(ts->rootDir, fn, NULL);
  +	    const char * dn = rpmGetPath(rootDir, "/", fn, NULL);
   	    rpmlog(RPMLOG_WARNING, _("cannot open Solve database in %s\n"), dn);
   	    dn = _free(dn);
   	    if (rc == 0)
  @@ .