- tools/rpmdb2solv: Adapt to xml-based /etc/products.d

- tools/rpmdb2solv: Add '-a <attribute>' to print
  distribution.target attribute of baseproduct.

diff --git a/package/libsatsolver.changes b/package/libsatsolver.changes
index 0f38023..36970b4 100644 (file)
--- a/package/libsatsolver.changes
+++ b/package/libsatsolver.changes
@@ -1,4 +1,11 @@
 -------------------------------------------------------------------
+Thu Sep  4 12:30:06 CEST 2008 - kkaempf@suse.de
+
+- tools/rpmdb2solv: Adapt to xml-based /etc/products.d
+- tools/rpmdb2solv: Add '-a <attribute>' to print
+  distribution.target attribute of baseproduct.
+
+-------------------------------------------------------------------
 Tue Sep  2 12:17:03 CEST 2008 - mls@suse.de
 
 - make solver includes use "" instead of <>, fixes bnc#415920

diff --git a/tools/repo_products.c b/tools/repo_products.c
index 3302640..8774761 100644 (file)
--- a/tools/repo_products.c
+++ b/tools/repo_products.c
@@ -32,6 +32,7 @@
 
 
 static ino_t baseproduct = 0;
+static ino_t currentproduct = 0;
 
 //#define DUMPOUT 0
 
@@ -97,7 +98,7 @@ struct parsedata {
   struct stateswitch *swtab[NUMSTATES];
   enum state sbtab[NUMSTATES];
 
-  const char *attribute; /* only print this attribute */
+  const char *attribute; /* only print this attribute, if currentproduct == baseproduct */
 
   const char *tmplang;
   const char *tmpvers;
@@ -216,7 +217,9 @@ startElement(void *userData, const char *name, const char **atts)
            repo_set_str(pd->repo, pd->s - pool->solvables, PRODUCT_FLAVOR, str);
          if ((str = find_attr("target", atts, 0)))
            {
-             if (pd->attribute && !strcmp(pd->attribute, "distribution.target"))
+             if (currentproduct == baseproduct
+                 && pd->attribute
+                 && !strcmp(pd->attribute, "distribution.target"))
                  printf("%s\n", str);
              else
                  repo_set_str(pd->repo, pd->s - pool->solvables, SOLVABLE_DISTRIBUTION, str);
@@ -342,7 +345,17 @@ repo_add_product(struct parsedata *pd, Repodata *data, FILE *fp, int code11)
   char buf[BUFF_SIZE];
   int i, l;
   struct stateswitch *sw;
+  struct stat st;
 
+  if (!fstat(fileno(fp), &st))
+    currentproduct = st.st_ino;
+  else 
+    {
+      currentproduct = baseproduct+1; /* make it != baseproduct if stat fails */
+      st.st_ctime = 0;
+      perror("Can't stat()");
+    }
+  
   for (i = 0, sw = stateswitches; sw->from != NUMSTATES; i++, sw++)
     {
       if (!pd->swtab[sw->from])
@@ -370,18 +383,11 @@ repo_add_product(struct parsedata *pd, Repodata *data, FILE *fp, int code11)
   if (pd->s)
     {
       Solvable *s = pd->s;
-      struct stat st;
-      if (!fstat(fileno(fp), &st))
-       {
-         repodata_set_num(pd->data, pd->handle, SOLVABLE_INSTALLTIME, st.st_ctime);
-         /* this is where <productsdir>/baseproduct points to */
-         if (st.st_ino == baseproduct)
-           repodata_set_str(pd->data, pd->handle, PRODUCT_TYPE, "base");
-       }
-      else
-       {
-         perror("Can't stat()");
-       }
+
+      repodata_set_num(pd->data, pd->handle, SOLVABLE_INSTALLTIME, st.st_ctime);
+      /* this is where <productsdir>/baseproduct points to */
+      if (currentproduct == baseproduct)
+       repodata_set_str(pd->data, pd->handle, PRODUCT_TYPE, "base");
       
       if (pd->tmprel)
        {
@@ -433,7 +439,9 @@ parse_dir(DIR *dir, const char *path, struct parsedata *pd, Repodata *repodata,
     {
       baseproduct = st.st_ino;
     }
-  
+  else
+    baseproduct = 0;
+
   while ((entry = readdir(dir)))
     {
       int len;