From: Michael Andres <ma@suse.de>
Date: Fri, 5 Sep 2008 11:32:14 +0000 (+0000)
Subject: tools/repo_susetags.c: Parse packages vendor
X-Git-Tag: BASE-SuSE-Code-12_1-Branch~539
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bd8ece7b1fe0628fb6a245db85a5329c0ce296f6;p=platform%2Fupstream%2Flibsolv.git

tools/repo_susetags.c: Parse packages vendor
---

diff --git a/VERSION.cmake b/VERSION.cmake
index f7a58ef..735c856 100644
--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -46,6 +46,6 @@
 
 SET(LIBSATSOLVER_MAJOR "0")
 SET(LIBSATSOLVER_MINOR "10")
-SET(LIBSATSOLVER_PATCH "6")
+SET(LIBSATSOLVER_PATCH "7")
 
-# last released 0.10.4
+# last released 0.10.7
diff --git a/package/libsatsolver.changes b/package/libsatsolver.changes
index 36970b4..fff8118 100644
--- a/package/libsatsolver.changes
+++ b/package/libsatsolver.changes
@@ -1,4 +1,10 @@
 -------------------------------------------------------------------
+Fri Sep  5 13:29:47 CEST 2008 - ma@suse.de
+
+- tools/repo_susetags.c: Parse packages vendor (bnc #422493).
+- 0.10.7
+
+-------------------------------------------------------------------
 Thu Sep  4 12:30:06 CEST 2008 - kkaempf@suse.de
 
 - tools/rpmdb2solv: Adapt to xml-based /etc/products.d
diff --git a/tools/repo_susetags.c b/tools/repo_susetags.c
index 9329a1f..24f77ac 100644
--- a/tools/repo_susetags.c
+++ b/tools/repo_susetags.c
@@ -733,7 +733,7 @@ repo_add_susetags(Repo *repo, FILE *fp, Id product, const char *language, int fl
 	        s->arch = arch;
 	      else
 	        s->arch = str2id(pool, sp[3], 1);
-	      s->vendor = vendor;
+	      s->vendor = vendor; /* default to product vendor */
 	    }
 	}
 
@@ -832,6 +832,9 @@ repo_add_susetags(Repo *repo, FILE *fp, Id product, const char *language, int fl
 	    handle = 0;
 	    indesc++;
 	    continue;
+          case CTAG('=', 'V', 'n', 'd'):                                        /* vendor */
+            s->vendor = str2id(pool, line + 6, 1);
+            continue;
 
         /* From here it's the attribute tags.  */
           case CTAG('=', 'G', 'r', 'p'):