]> git.ipfire.org Git - thirdparty/libsolv.git/commitdiff
We can put reldeps into incore for some time now
authorMichael Schroeder <mls@suse.de>
Thu, 7 Apr 2016 13:55:16 +0000 (15:55 +0200)
committerMichael Schroeder <mls@suse.de>
Thu, 7 Apr 2016 13:55:16 +0000 (15:55 +0200)
So remove the triggers workaround

ext/repo_rpmdb.c

index d49f9d893c9607d9eb1b719b9b2ebe08809db635..804d08ffeb7a195e10c0c3027fe86710641b817e 100644 (file)
@@ -1014,24 +1014,11 @@ rpm2solv(Pool *pool, Repo *repo, Repodata *data, Solvable *s, RpmHead *rpmhead,
        repodata_set_sourcepkg(data, handle, sourcerpm);
       if ((flags & RPM_ADD_TRIGGERS) != 0)
        {
-         Id id, lastid;
          unsigned int ida = makedeps(pool, repo, rpmhead, TAG_TRIGGERNAME, TAG_TRIGGERVERSION, TAG_TRIGGERFLAGS, 0);
-
-         lastid = 0;
-         for (; (id = repo->idarraydata[ida]) != 0; ida++)
-           {
-             /* we currently do not support rel ids in incore data, so
-              * strip off versioning information */
-             while (ISRELDEP(id))
-               {
-                 Reldep *rd = GETRELDEP(pool, id);
-                 id = rd->name;
-               }
-             if (id == lastid)
-               continue;
+         Id id, lastid = 0;
+         for (lastid = 0; (id = repo->idarraydata[ida]) != 0; ida++, lastid = id)
+           if (id != lastid)
              repodata_add_idarray(data, handle, SOLVABLE_TRIGGERS, id);
-             lastid = id;
-           }
        }
       if ((flags & RPM_ADD_NO_FILELIST) == 0)
        addfilelist(data, handle, rpmhead, flags);