- rel 39; fix patch

[packages/poldek.git] / poldek-dont-be-greedy.patch

diff --git a/poldek-dont-be-greedy.patch b/poldek-dont-be-greedy.patch
index ec30c8c741cd49fccd8db9bb3105dcbfa09b3ec6..00fb8eeba42cfd2199ed70cf5291401954c98814 100644 (file)
--- a/poldek-dont-be-greedy.patch
+++ b/poldek-dont-be-greedy.patch
@@ -1,14 +1,13 @@
 diff --git a/install3/requirements.c b/install3/requirements.c
-index ea9df61..361c400 100644
+index ea9df61..fee15db 100644
 --- a/install3/requirements.c
 +++ b/install3/requirements.c
-@@ -386,7 +392,8 @@ static int process_orphan_req(int indent, struct i3ctx *ictx,
+@@ -386,7 +392,7 @@ static int process_orphan_req(int indent, struct i3ctx *ictx,
      }
      
      /* try upgrade orphan */
 -    if (ts->getop(ts, POLDEK_OP_GREEDY)) {
-+    if (ts->getop(ts, POLDEK_OP_GREEDY) && !(tomark && pkg_caps_match_req(tomark, req,
-+              POLDEK_MA_PROMOTE_EPOCH || POLDEK_MA_PROMOTE_VERSION))) {
++    if (ts->getop(ts, POLDEK_OP_GREEDY) && (tomark == NULL)) {
          if (try_to_upgrade_orphan(indent, ictx, pkg, req, tomark))
              goto l_end;
      }