From: Michael Schroeder Date: Tue, 1 Jun 2010 16:58:18 +0000 (+0200) Subject: - make installcheck work with debian Packages files X-Git-Tag: BASE-SuSE-Code-12_1-Branch~158^2~27 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1e89b69f2cad43391427343f8f435d1571eda83c;p=platform%2Fupstream%2Flibsolv.git - make installcheck work with debian Packages files --- diff --git a/tools/installcheck.c b/tools/installcheck.c index bab686c..279c4bd 100644 --- a/tools/installcheck.c +++ b/tools/installcheck.c @@ -20,8 +20,12 @@ #include "pool.h" #include "poolarch.h" #include "repo_solv.h" +#ifndef DEBIAN #include "repo_susetags.h" #include "repo_rpmmd.h" +#else +#include "repo_deb.h" +#endif #include "solver.h" static ssize_t @@ -126,6 +130,7 @@ main(int argc, char **argv) exit(1); } Repo *repo = repo_create(pool, argv[i]); +#ifndef DEBIAN if (l >= 8 && !strcmp(argv[i] + l - 8, "packages")) { repo_add_susetags(repo, fp, 0, 0, 0); @@ -138,6 +143,16 @@ main(int argc, char **argv) { repo_add_rpmmd(repo, fp, 0, 0); } +#else + if (l >= 8 && !strcmp(argv[i] + l - 8, "Packages")) + { + repo_add_debpackages(repo, fp, 0); + } + else if (l >= 11 && !strcmp(argv[i] + l - 11, "Packages.gz")) + { + repo_add_debpackages(repo, fp, 0); + } +#endif else if (repo_add_solv(repo, fp)) { fprintf(stderr, "could not add repo %s\n", argv[i]); @@ -151,6 +166,7 @@ main(int argc, char **argv) rpmid = str2id(pool, "rpm", 0); rpmarch = str2id(pool, arch, 0); rpmrel = 0; +#ifndef DEBIAN if (rpmid && rpmarch) { for (p = 1; p < pool->nsolvables; p++) @@ -162,6 +178,7 @@ main(int argc, char **argv) if (p < pool->nsolvables) rpmrel = rel2id(pool, rpmid, rpmarch, REL_ARCH, 1); } +#endif queue_init(&job); queue_init(&rids);