- oops, forgot bindings

diff --git a/tools/dumpsolv.c b/tools/dumpsolv.c
index 66970e6..9ae443d 100644 (file)
--- a/tools/dumpsolv.c
+++ b/tools/dumpsolv.c
@@ -72,7 +72,7 @@ dump_attr(Repo *repo, Repodata *data, Repokey *key, KeyValue *kv)
   int indent = 0;
 
   keyname = id2str(repo->pool, key->name);
-  for (kvp = kv; (kvp = kvp->path) != 0; indent += 2)
+  for (kvp = kv; (kvp = kvp->parent) != 0; indent += 2)
     printf("  ");
   switch(key->type)
     {

diff --git a/tools/repo_updateinfoxml.c b/tools/repo_updateinfoxml.c
index 59a7ac1..deff3dd 100644 (file)
--- a/tools/repo_updateinfoxml.c
+++ b/tools/repo_updateinfoxml.c
@@ -361,7 +361,7 @@ startElement(void *userData, const char *name, const char **atts)
       {
        const char *arch = 0, *name = 0, *src = 0;
        Id evr = makeevr_atts(pool, pd, atts); /* parse "epoch", "version", "release" */
-       Id n, a;
+       Id n, a = 0;
        Id rel_id;
 
        for (; *atts; atts += 2)
@@ -375,13 +375,14 @@ startElement(void *userData, const char *name, const char **atts)
          }
        /* generated Id for name */
        n = str2id(pool, name, 1);
+       rel_id = n;
        if (arch)
          {
            /*  generate Id for arch and combine with name */
            a = str2id(pool, arch, 1);
-           n = rel2id(pool, n, a, REL_ARCH, 1);
+           rel_id = rel2id(pool, n, a, REL_ARCH, 1);
          }
-       rel_id = rel2id(pool, n, evr, REL_LT, 1);
+       rel_id = rel2id(pool, rel_id, evr, REL_LT, 1);
 
        solvable->conflicts = repo_addid_dep(pd->repo, solvable->conflicts, rel_id, 0);
 

diff --git a/tools/repo_write.c b/tools/repo_write.c
index 2e14a2b..881900b 100644 (file)
--- a/tools/repo_write.c
+++ b/tools/repo_write.c
@@ -862,7 +862,7 @@ repo_write_adddata(struct cbdata *cbdata, Repodata *data, Repokey *key, KeyValue
          data_addid(xd, kv->num);
        if (!kv->eof)
          data_addid(xd, cbdata->subschemata[cbdata->current_sub++]);
-       if (xd == cbdata->extdata + 0 && !kv->path && !cbdata->doingsolvables)
+       if (xd == cbdata->extdata + 0 && !kv->parent && !cbdata->doingsolvables)
          {
            if (xd->len - cbdata->lastlen > cbdata->maxdata)
              cbdata->maxdata = xd->len - cbdata->lastlen;