summaryrefslogtreecommitdiff
path: root/librazor
diff options
context:
space:
mode:
authorKristian Høgsberg <krh@redhat.com>2008-07-08 21:59:36 -0400
committerKristian Høgsberg <krh@redhat.com>2008-07-08 21:59:36 -0400
commit5e777955178cbb1eb37ca9c95ec9c04ff90be939 (patch)
treeebcfe95747db49695a5482ad009d5ce2e8d1701c /librazor
parentd255e6c8c6c8a2282e35b8b43c1bd8e12e7a6906 (diff)
Always open all three rzdb files when we're merging package sets.
Diffstat (limited to 'librazor')
-rw-r--r--librazor/root.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/librazor/root.c b/librazor/root.c
index 6457dcf..579553c 100644
--- a/librazor/root.c
+++ b/librazor/root.c
@@ -103,6 +103,7 @@ RAZOR_EXPORT struct razor_root *
razor_root_open(const char *root)
{
struct razor_root *image;
+ char details_path[PATH_MAX], files_path[PATH_MAX];
assert (root != NULL);
@@ -130,8 +131,15 @@ razor_root_open(const char *root)
snprintf(image->path, sizeof image->path,
"%s%s/%s", root, razor_root_path, system_repo_filename);
+ snprintf(details_path, sizeof details_path,
+ "%s%s/%s", root, razor_root_path, system_repo_details_filename);
+ snprintf(files_path, sizeof files_path,
+ "%s%s/%s", root, razor_root_path, system_repo_files_filename);
+
image->system = razor_set_open(image->path);
- if (image->system == NULL) {
+ if (image->system == NULL ||
+ razor_set_open_details(image->system, details_path) ||
+ razor_set_open_files(image->system, files_path)) {
unlink(image->new_path);
close(image->fd);
free(image);