Remember the /etc/products.d enties filename in .solv (bnc #432932)

diff --git a/VERSION.cmake b/VERSION.cmake
index 02c527a0e6c0db98799556b2920f8f6a8a864197..0134f1e0ceca85eed915deda4faf6eaa45c494b1 100644 (file)
--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -46,6 +46,6 @@
 
 SET(LIBSATSOLVER_MAJOR "0")
 SET(LIBSATSOLVER_MINOR "12")
-SET(LIBSATSOLVER_PATCH "0")
+SET(LIBSATSOLVER_PATCH "1")
 
-# last released 0.12.0
+# last released 0.12.1

diff --git a/package/libsatsolver.changes b/package/libsatsolver.changes
index 9c225c9e24c74e80dff95717ff72f3b77a2d3a15..16a8227bf677a658fd9d7d270cef8136cef0e411 100644 (file)
--- a/package/libsatsolver.changes
+++ b/package/libsatsolver.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Oct 24 16:03:13 CEST 2008 - ma@suse.de
+
+- Remember the /etc/products.d enties filename in .solv 
+  (bnc #432932)
+- 0.12.1
+
 -------------------------------------------------------------------
 Thu Oct 23 10:49:40 CEST 2008 - mrueckert@suse.de
 

diff --git a/src/knownid.h b/src/knownid.h
index 803238759f595867e4785470fce72ac05ab6bf7e..548bda439c257f854df595ae29bdab1dbf932589 100644 (file)
--- a/src/knownid.h
+++ b/src/knownid.h
@@ -157,6 +157,7 @@ KNOWNID(UPDATE_REFERENCE_ID,                "update:reference:id"),         /*  id, e.g. bug number *
 KNOWNID(UPDATE_REFERENCE_TITLE,                "update:reference:title"),      /*  title, e.g. "the bla forz scribs on fuggle" */
 
 /* name */
+KNOWNID(PRODUCT_REFERENCEFILE,         "product:referencefile"),
 KNOWNID(PRODUCT_SHORTLABEL,            "product:shortlabel"),
 KNOWNID(PRODUCT_DISTPRODUCT,           "product:distproduct"),
 KNOWNID(PRODUCT_DISTVERSION,           "product:distversion"),

diff --git a/tools/repo_products.c b/tools/repo_products.c
index 6083a02edf4645f7e4c404fc6e5708f1b5e80bcc..f7cbaf1cb77397b5f6b63817f5943800b70cf7de 100644 (file)
--- a/tools/repo_products.c
+++ b/tools/repo_products.c
@@ -92,6 +92,7 @@ static struct stateswitch stateswitches[] = {
 
 struct parsedata {
   const char *filename;
+  const char *basename;
   int depth;
   enum state state;
   int statedepth;
@@ -270,6 +271,9 @@ endElement(void *userData, const char *name)
       if (pd->ctime)
         repodata_set_num(pd->data, pd->handle, SOLVABLE_INSTALLTIME, pd->ctime);
 
+      if ( pd->basename )
+        repodata_set_str(pd->data, pd->handle, PRODUCT_REFERENCEFILE, pd->basename);
+
       /* this is where <productsdir>/baseproduct points to */
       if (pd->currentproduct == pd->baseproduct)
        repodata_set_str(pd->data, pd->handle, PRODUCT_TYPE, "base");
@@ -570,6 +574,7 @@ parse_dir(DIR *dir, const char *path, struct parsedata *pd, int code11)
              break;
            }
          pd->filename = fullpath;
+         pd->basename = entry->d_name;
          repo_add_product(pd, fp, code11);
          fclose(fp);
        }
@@ -600,7 +605,7 @@ repo_add_products(Repo *repo, const char *proddir, const char *root, const char
 
   if (!(flags & REPO_REUSE_REPODATA))
     data = repo_add_repodata(repo, 0);
-  else 
+  else
     data = repo_last_repodata(repo);
 
   memset(&pd, 0, sizeof(pd));