ref: refs/heads/SuSE-Code-11-Branch
commit ace0d001ee18ebcebc1f41f5162e2e6c913efa2b
Author: Michael Schroeder
Date: Mon Oct 26 15:12:29 2009 +0100
- backport "ignore products element so that repo2solv works" patch
(bnc#497973)
---
VERSION.cmake | 4 ++--
package/libsatsolver.changes | 7 +++++++
tools/repo_rpmmd.c | 4 ++++
3 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/VERSION.cmake b/VERSION.cmake
index 513bada..dfdc49b 100644
--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -46,6 +46,6 @@
SET(LIBSATSOLVER_MAJOR "0")
SET(LIBSATSOLVER_MINOR "13")
-SET(LIBSATSOLVER_PATCH "8")
+SET(LIBSATSOLVER_PATCH "9")
-# last released 0.13.8
+# last released 0.13.9
diff --git a/package/libsatsolver.changes b/package/libsatsolver.changes
index cd756b3..aefe419 100644
--- a/package/libsatsolver.changes
+++ b/package/libsatsolver.changes
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Mon Oct 26 15:08:25 CET 2009 - mls@suse.de
+
+- backport "ignore products element so that repo2solv works" patch
+ (bnc#497973)
+- 0.13.9
+
+-------------------------------------------------------------------
Fri Sep 25 15:33:38 CEST 2009 - mls@suse.de
- backport allocation fix in repo_solv
diff --git a/tools/repo_rpmmd.c b/tools/repo_rpmmd.c
index 027c723..6a8e841 100644
--- a/tools/repo_rpmmd.c
+++ b/tools/repo_rpmmd.c
@@ -634,6 +634,8 @@ startElement(void *userData, const char *name, const char **atts)
if (pd->state == STATE_START && !strcmp(name, "patterns"))
return;
+ if (pd->state == STATE_START && !strcmp(name, "products"))
+ return;
//if (pd->state == STATE_START && !strcmp(name, "metadata"))
// return;
if (pd->state == STATE_SOLVABLE && !strcmp(name, "format"))
@@ -885,6 +887,8 @@ endElement(void *userData, const char *name)
/* ignore patterns & metadata */
if (pd->state == STATE_START && !strcmp(name, "patterns"))
return;
+ if (pd->state == STATE_START && !strcmp(name, "products"))
+ return;
//if (pd->state == STATE_START && !strcmp(name, "metadata"))
// return;
if (pd->state == STATE_SOLVABLE && !strcmp(name, "format"))
--
To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org
For additional commands, e-mail: zypp-commit+help@opensuse.org
