packages: poldek/poldek-dont-be-greedy.patch - more simple and less overhead

[cactus]

Author: cactus                       Date: Thu Oct 29 10:32:05 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- more simple and less overhead

---- Files affected:
packages/poldek:
   poldek-dont-be-greedy.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/poldek/poldek-dont-be-greedy.patch
diff -u packages/poldek/poldek-dont-be-greedy.patch:1.1 packages/poldek/poldek-dont-be-greedy.patch:1.2
--- packages/poldek/poldek-dont-be-greedy.patch:1.1	Thu Oct 29 10:08:58 2009
+++ packages/poldek/poldek-dont-be-greedy.patch	Thu Oct 29 11:32:00 2009
@@ -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;
      }
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/poldek/poldek-dont-be-greedy.patch?r1=1.1&r2=1.2&f=u