From: Michael Schroeder <mls@suse.de>
Date: Mon, 25 Jun 2012 11:42:25 +0000 (+0200)
Subject: - fix typo in repodata_merge_attrs
X-Git-Tag: BASE-SuSE-Code-12_2-Branch~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=975ce4f08e536a84cef482f676a86c6d55f1ca92;p=thirdparty%2Flibsolv.git

- fix typo in repodata_merge_attrs
---

diff --git a/package/libsolv.changes b/package/libsolv.changes
index d0e65352..4eb1ea6b 100644
--- a/package/libsolv.changes
+++ b/package/libsolv.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Jun 25 13:40:58 CEST 2012 - mls@suse.de
+
+- fix typo in repodata_merge_attrs [bnc#767510]
+
 -------------------------------------------------------------------
 Wed May 30 14:46:48 CEST 2012 - mls@suse.de
 
diff --git a/src/repodata.c b/src/repodata.c
index 41b7b8db..48a927d8 100644
--- a/src/repodata.c
+++ b/src/repodata.c
@@ -2425,7 +2425,7 @@ void
 repodata_merge_attrs(Repodata *data, Id dest, Id src)
 {
   Id *keyp;
-  if (dest == src || data->attrs || !(keyp = data->attrs[src - data->start]))
+  if (dest == src || !data->attrs || !(keyp = data->attrs[src - data->start]))
     return;
   for (; *keyp; keyp += 2)
     repodata_insert_keyid(data, dest, keyp[0], keyp[1], 0);