summaryrefslogtreecommitdiff
path: root/tools/installcheck.c
diff options
context:
space:
mode:
authorMichael Schroeder <mls@suse.de>2012-04-13 19:23:33 +0200
committerMichael Schroeder <mls@suse.de>2012-04-13 19:23:33 +0200
commit5702cc433a97b2365801855bdc5572f940d8bc9a (patch)
tree68a62cbfd9cdfa8f2fd755b2a39b71773bb30afe /tools/installcheck.c
parentca1d509d28858cd9d74a4ee7724e774b58ec459c (diff)
downloadlibsolv-5702cc433a97b2365801855bdc5572f940d8bc9a.tar.gz
libsolv-5702cc433a97b2365801855bdc5572f940d8bc9a.tar.bz2
libsolv-5702cc433a97b2365801855bdc5572f940d8bc9a.zip
- add pool_error and pool_errstr. get rid of lots of exit() calls.
Diffstat (limited to 'tools/installcheck.c')
-rw-r--r--tools/installcheck.c19
1 files changed, 11 insertions, 8 deletions
diff --git a/tools/installcheck.c b/tools/installcheck.c
index 421c2b1..4441049 100644
--- a/tools/installcheck.c
+++ b/tools/installcheck.c
@@ -77,7 +77,7 @@ main(int argc, char **argv)
for (i = 2; i < argc; i++)
{
FILE *fp;
- int l;
+ int r, l;
if (!strcmp(argv[i], "--withsrc"))
{
@@ -115,38 +115,41 @@ main(int argc, char **argv)
exit(1);
}
repo = repo_create(pool, argv[i]);
+ r = 0;
if (0)
{
}
#ifdef ENABLE_SUSEREPO
else if (l >= 8 && !strcmp(argv[i] + l - 8, "packages"))
{
- repo_add_susetags(repo, fp, 0, 0, 0);
+ r = repo_add_susetags(repo, fp, 0, 0, 0);
}
else if (l >= 11 && !strcmp(argv[i] + l - 11, "packages.gz"))
{
- repo_add_susetags(repo, fp, 0, 0, 0);
+ r = repo_add_susetags(repo, fp, 0, 0, 0);
}
#endif
#ifdef ENABLE_RPMMD
else if (l >= 14 && !strcmp(argv[i] + l - 14, "primary.xml.gz"))
{
- repo_add_rpmmd(repo, fp, 0, 0);
+ r = repo_add_rpmmd(repo, fp, 0, 0);
}
#endif
#ifdef ENABLE_DEBIAN
else if (l >= 8 && !strcmp(argv[i] + l - 8, "Packages"))
{
- repo_add_debpackages(repo, fp, 0);
+ r = repo_add_debpackages(repo, fp, 0);
}
else if (l >= 11 && !strcmp(argv[i] + l - 11, "Packages.gz"))
{
- repo_add_debpackages(repo, fp, 0);
+ r = repo_add_debpackages(repo, fp, 0);
}
#endif
- else if (repo_add_solv(repo, fp, 0))
+ else
+ r = repo_add_solv(repo, fp, 0);
+ if (r)
{
- fprintf(stderr, "could not add repo %s\n", argv[i]);
+ fprintf(stderr, "could not add repo %s: %s\n", argv[i], pool_errstr(pool));
exit(1);
}
if (fp != stdin)