RPM Package Manager, CVS Repository
  /cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Jeff Johnson
  Root:   /v/rpm/cvs                       Email:  jbj@rpm5.org
  Module: rpm                              Date:   13-Aug-2010 19:29:50
  Branch: HEAD                             Handle: 2010081317295000

  Modified files:
    rpm                     CHANGES
    rpm/rpmdb               rpmdb.c

  Log:
    - solve: generalize %_dbpath to permit multiple rpmdb's.

  Summary:
    Revision    Changes     Path
    1.3411      +1  -0      rpm/CHANGES
    1.388       +8  -3      rpm/rpmdb/rpmdb.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.3410 -r1.3411 CHANGES
  --- rpm/CHANGES	13 Aug 2010 14:19:14 -0000	1.3410
  +++ rpm/CHANGES	13 Aug 2010 17:29:50 -0000	1.3411
  @@ -1,4 +1,5 @@
   5.3.2 -> 5.4a1:
  +    - jbj: solve: generalize %_dbpath to permit mutiple rpmdb's.
       - jbj: solve: flip --aid "opt-in" behavior to --noaid "opt-out".
       - jbj: solve: fix: don't free the package file name when depsolving.
       - jbj: stub in bag/svn/cvs/git objects.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/rpmdb.c
  ============================================================================
  $ cvs diff -u -r1.387 -r1.388 rpmdb.c
  --- rpm/rpmdb/rpmdb.c	30 Apr 2010 15:07:17 -0000	1.387
  +++ rpm/rpmdb/rpmdb.c	13 Aug 2010 17:29:50 -0000	1.388
  @@ -825,14 +825,18 @@
   	/*@modifies rpmGlobalMacroContext, fileSystem, internalState @*/
   {
       const char * s = rpmGetPath(uri, NULL);
  +    ARGV_t av = NULL;
  +    int xx = argvSplit(&av, s, ":");
       const char * fn = NULL;
  -    urltype ut = urlPath(s, &fn);
  +    /* XXX av contains a colon separated path split, use the 1st path. */
  +    urltype ut = urlPath(av[0], &fn);
  +    
  +xx = xx;
   
       switch (ut) {
       case URL_IS_PATH:
       case URL_IS_UNKNOWN:
  -	fn = s;
  -	s = NULL;
  +	fn = xstrdup(av[0]);
   	break;
       case URL_IS_HTTPS:
       case URL_IS_HTTP:
  @@ -862,6 +866,7 @@
   	}
       }
   
  +    av = argvFree(av);
       s = _free(s);
   assert(fn != NULL);
       return fn;
  @@ .