projects
/
platform
/
upstream
/
libsolv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d1e9f07
)
exit if there is an error opening the old solv
author
Stephan Kulow
<coolo@suse.de>
Sun, 24 Feb 2008 15:21:16 +0000
(15:21 +0000)
committer
Stephan Kulow
<coolo@suse.de>
Sun, 24 Feb 2008 15:21:16 +0000
(15:21 +0000)
tools/rpmdb2solv.c
patch
|
blob
|
history
diff --git
a/tools/rpmdb2solv.c
b/tools/rpmdb2solv.c
index
44a537f
..
e818e11
100644
(file)
--- a/
tools/rpmdb2solv.c
+++ b/
tools/rpmdb2solv.c
@@
-34,22
+34,27
@@
main(int argc, char **argv)
int g;
const char *root = "/";
int g;
const char *root = "/";
- while ((g = getopt (argc, argv, "
-
r:")) >= 0)
+ while ((g = getopt (argc, argv, "r:")) >= 0)
switch (g)
{
case 'r': root = optarg; break;
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);
+ default:
+ exit(1);
}
}
+ if (optind < argc)
+ {
+ refpool = pool;
+ if ((fp = fopen(argv[optind], "r")) == NULL)
+ {
+ perror(argv[optind]);
+ exit(1);
+ }
+ ref = repo_create(refpool, "ref");
+ repo_add_solv(ref, fp);
+ fclose(fp);
+ }
+
repo = repo_create(pool, "installed");
repo_add_rpmdb(repo, ref, root);
if (ref)
repo = repo_create(pool, "installed");
repo_add_rpmdb(repo, ref, root);
if (ref)