code.vuplus.com Git - vuplus_openvuplus_3.0/blob - meta-openvuplus/recipes-devtools/opkg/opkg/0002-Don-t-mark-Conflicts-as-Depends.patch

   1 From 8c00c6be3723a0dcf05a10b5aba8c1c3b1fe4cf7 Mon Sep 17 00:00:00 2001
   2 From: Andreas Oberritter <obi@opendreambox.org>
   3 Date: Wed, 16 May 2012 23:29:04 +0200
   4 Subject: [PATCH 02/10] Don't mark Conflicts as Depends
   5
   6 - Fixes 'whatconflicts' sub-command.
   7
   8 Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
   9 ---
  10  libopkg/pkg_depends.c |    2 +-
  11  1 file changed, 1 insertion(+), 1 deletion(-)
  12
  13 diff --git a/libopkg/pkg_depends.c b/libopkg/pkg_depends.c
  14 index 1e14d1f..a61e80e 100644
  15 --- a/libopkg/pkg_depends.c
  16 +++ b/libopkg/pkg_depends.c
  17 @@ -609,8 +609,8 @@ void buildConflicts(pkg_t * pkg)
  18
  19      conflicts = pkg->conflicts = xcalloc(pkg->conflicts_count, sizeof(compound_depend_t));
  20      for (i = 0; i < pkg->conflicts_count; i++) {
  21 -        conflicts->type = CONFLICTS;
  22          parseDepends(conflicts, pkg->conflicts_str[i]);
  23 +        conflicts->type = CONFLICTS;
  24          free(pkg->conflicts_str[i]);
  25          conflicts++;
  26      }
  27 --
  28 1.7.9.5
  29