Mailinglist Archive: zypp-commit (545 mails)

[matz@xxxxxxxxxxxxxxxx]

Author: matz
Date: Wed Feb  6 21:13:36 2008
New Revision: 8509

URL: http://svn.opensuse.org/viewcvs/zypp?rev=8509&view=rev
Log:
Fix merge_attrs, so that not (e.g.) two medianr attributes show up in
susetags converted solvables using =Shr .

Modified:
    trunk/sat-solver/src/repodata.c

Modified: trunk/sat-solver/src/repodata.c
URL: 
http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/repodata.c?rev=8509&r1=8508&r2=8509&view=diff
==============================================================================
--- trunk/sat-solver/src/repodata.c (original)
+++ trunk/sat-solver/src/repodata.c Wed Feb  6 21:13:36 2008
@@ -556,12 +556,17 @@
   if (data->attrs[entry])
     {
       for (pp = data->attrs[entry]; *pp; pp += 2)
-        if (*pp == keyid)
+       /* Determine equality based on the name only, allows us to change
+          type (when overwrite is set), and makes TYPE_CONSTANT work.  */
+        if (data->keys[*pp].name == data->keys[keyid].name)
           break;
       if (*pp)
         {
          if (overwrite)
-            pp[1] = val;
+           {
+             pp[0] = keyid;
+              pp[1] = val;
+           }
           return;
         }
       i = pp - data->attrs[entry];

--
To unsubscribe, e-mail: zypp-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: zypp-commit+help@xxxxxxxxxxxx