From: Duncan Mac-Vicar P <dmacvicar@suse.de>
Date: Thu, 11 Sep 2008 12:32:32 +0000 (+0000)
Subject: update repository matching
X-Git-Tag: BASE-SuSE-Code-12_1-Branch~308^2~206
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=265c2c9ca2d774e9d10da3373f2bbd0f6c0954b4;p=thirdparty%2Flibsolv.git

update repository matching
---

diff --git a/VERSION.cmake b/VERSION.cmake
index bdc3dd90..fda6a5dd 100644
--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -46,6 +46,6 @@
 
 SET(LIBSATSOLVER_MAJOR "0")
 SET(LIBSATSOLVER_MINOR "10")
-SET(LIBSATSOLVER_PATCH "10")
+SET(LIBSATSOLVER_PATCH "11")
 
-# last released 0.10.10
+# last released 0.10.11
diff --git a/package/libsatsolver.changes b/package/libsatsolver.changes
index e422a35d..74122854 100644
--- a/package/libsatsolver.changes
+++ b/package/libsatsolver.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Sep 11 14:30:16 CEST 2008 - dmacvicar@suse.de
+
+- add REPOSITORY_UPDATES to match product -> repos
+- make updateinfo.xml support id attribute in collection that
+  leads to insert that the repository updates that id.
+  - 0.10.11
+  
 -------------------------------------------------------------------
 Wed Sep 10 18:11:10 CEST 2008 - dmacvicar@suse.de
 
diff --git a/src/knownid.h b/src/knownid.h
index 9283764f..afe91256 100644
--- a/src/knownid.h
+++ b/src/knownid.h
@@ -167,6 +167,8 @@ KNOWNID(REPOSITORY_TIMESTAMP,           "repository:timestamp"),
 /* hint when the metadata could be outdated
    w/respect to generated timestamp */
 KNOWNID(REPOSITORY_EXPIRE,              "repository:expire"),
+/* which things does this repo provides updates for, if it does */
+KNOWNID(REPOSITORY_UPDATES,              "repository:updates"),
 
 KNOWNID(DELTA_PACKAGE_NAME,		"delta:pkgname"),
 KNOWNID(DELTA_PACKAGE_EVR,              "delta:pkgevr"),
diff --git a/tools/repo_updateinfoxml.c b/tools/repo_updateinfoxml.c
index 4114d84a..618d6a49 100644
--- a/tools/repo_updateinfoxml.c
+++ b/tools/repo_updateinfoxml.c
@@ -140,7 +140,6 @@ static int package_flags = 0; /* same for reboot/restart flags, to be written at
  * find attribute
  */
 
-/*
 static const char *
 find_attr(const char *txt, const char **atts)
 {
@@ -151,8 +150,6 @@ find_attr(const char *txt, const char **atts)
     }
   return 0;
 }
-*/
-
 
 /*
  * create evr (as Id) from 'epoch', 'version' and 'release' attributes
@@ -363,9 +360,15 @@ startElement(void *userData, const char *name, const char **atts)
       break;
       case STATE_PKGLIST:
       break;
-      /* <collection short="F8"> */
+      /* <collection short="F8" id="PRODUCT0001444"> */
       case STATE_COLLECTION:
-      break;
+        {
+          /* insert a REPOSITORY_UPDATES for every present collection id */
+          const char *cid;
+          if ((cid = find_attr("id", atts)))
+            repodata_add_poolstr_array(pd->data, -1, REPOSITORY_UPDATES, cid);
+          break;
+        }
       /* <name>Fedora 8</name> */ 
       case STATE_NAME:
       break;