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 20:18:52
  Branch: rpm-5_1                          Handle: 2010081318185001

  Modified files:           (Branch: rpm-5_1)
    rpm                     CHANGES
    rpm/rpmdb               rpmdb.c

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

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

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.2288.2.312 -r1.2288.2.313 CHANGES
  --- rpm/CHANGES	13 Aug 2010 16:04:25 -0000	1.2288.2.312
  +++ rpm/CHANGES	13 Aug 2010 18:18:50 -0000	1.2288.2.313
  @@ -1,4 +1,5 @@
   5.1.9 -> 5.1.10:
  +    - jbj: solve: generalize %_dbpath to permit multiple 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: tests: backport the IDMS install for coverage testing w sqlite3.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/rpmdb.c
  ============================================================================
  $ cvs diff -u -r1.246.2.16 -r1.246.2.17 rpmdb.c
  --- rpm/rpmdb/rpmdb.c	4 Apr 2009 20:31:42 -0000	1.246.2.16
  +++ rpm/rpmdb/rpmdb.c	13 Aug 2010 18:18:51 -0000	1.246.2.17
  @@ -1106,14 +1106,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:
  @@ -1143,6 +1147,7 @@
   	}
       }
   
  +    av = argvFree(av);
       s = _free(s);
   assert(fn != NULL);
       return fn;
  @@ .