Author: coolo Date: Fri Feb 22 11:07:53 2008 New Revision: 8870 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8870&view=rev Log: finish root support Modified: trunk/sat-solver/tools/repo_rpmdb.c trunk/sat-solver/tools/rpmdb2solv.c Modified: trunk/sat-solver/tools/repo_rpmdb.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo_rpmdb.c?rev=8870&r1=8869&r2=8870&view=diff ============================================================================== --- trunk/sat-solver/tools/repo_rpmdb.c (original) +++ trunk/sat-solver/tools/repo_rpmdb.c Fri Feb 22 11:07:53 2008 @@ -718,6 +718,7 @@ unsigned int refmask, h; int asolv; Repodata *repodata; + char dbpath[PATH_MAX]; if (repo->start != repo->end) abort(); /* FIXME: rpmdbid */ @@ -736,9 +737,10 @@ if (!ref) { - if (db->open(db, 0, "/var/lib/rpm/Packages", 0, DB_HASH, DB_RDONLY, 0664)) + snprintf(dbpath, PATH_MAX, "%s/var/lib/rpm/Packages", rootdir); + if (db->open(db, 0, dbpath, 0, DB_HASH, DB_RDONLY, 0664)) { - perror("db->open /var/lib/rpm/Packages"); + perror("db->open var/lib/rpm/Packages"); exit(1); } if (db->get_byteswapped(db, &byteswapped)) @@ -828,9 +830,10 @@ } else { - if (db->open(db, 0, "/var/lib/rpm/Name", 0, DB_HASH, DB_RDONLY, 0664)) + snprintf(dbpath, PATH_MAX, "%s/var/lib/rpm/Name", rootdir); + if (db->open(db, 0, dbpath, 0, DB_HASH, DB_RDONLY, 0664)) { - perror("db->open /var/lib/rpm/Name"); + perror("db->open var/lib/rpm/Name"); exit(1); } if (db->get_byteswapped(db, &byteswapped)) @@ -955,9 +958,10 @@ perror("db_create"); exit(1); } - if (db->open(db, 0, "/var/lib/rpm/Packages", 0, DB_HASH, DB_RDONLY, 0664)) + snprintf(dbpath, PATH_MAX, "%s/var/lib/rpm/Packages", rootdir); + if (db->open(db, 0, dbpath, 0, DB_HASH, DB_RDONLY, 0664)) { - perror("db->open /var/lib/rpm/Packages"); + perror("db->open var/lib/rpm/Packages"); exit(1); } if (db->get_byteswapped(db, &byteswapped)) Modified: trunk/sat-solver/tools/rpmdb2solv.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/rpmdb2solv.c?rev=8870&r1=8869&r2=8870&view=diff ============================================================================== --- trunk/sat-solver/tools/rpmdb2solv.c (original) +++ trunk/sat-solver/tools/rpmdb2solv.c Fri Feb 22 11:07:53 2008 @@ -16,6 +16,7 @@ #include #include #include +#include #include "pool.h" #include "repo.h" @@ -29,22 +30,28 @@ Pool *pool = pool_create(); Repo *repo, *ref = 0; FILE *fp; - - if (argc != 1) - { - Pool *refpool = pool; - if ((fp = fopen(argv[1], "r")) == NULL) - { - perror(argv[1]); - exit(0); - } - ref = repo_create(refpool, "ref"); - repo_add_solv(ref, fp); - fclose(fp); - } - + Pool *refpool; + int g; + const char *root = "/"; + + while ((g = getopt (argc, argv, "-r:")) >= 0) + switch (g) + { + case 'r': root = optarg; break; + case 1: + refpool = pool; + if ((fp = fopen(argv[1], "r")) == NULL) + { + perror(argv[1]); + exit(0); + } + ref = repo_create(refpool, "ref"); + repo_add_solv(ref, fp); + fclose(fp); + } + repo = repo_create(pool, "installed"); - repo_add_rpmdb(repo, ref, "/"); + repo_add_rpmdb(repo, ref, root); if (ref) { if (ref->pool != pool) -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org