From fcf44861586f712cef44c150b6046d759b0ec9ec Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sat, 2 Feb 2013 14:47:04 +0100 Subject: [PATCH] xbps: fix inverted test in latest patch. --- ...Ignore-package-conflicts-against-themselves-due-to-v.patch | 4 ++-- srcpkgs/xbps/template | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/xbps/patches/0003-Ignore-package-conflicts-against-themselves-due-to-v.patch b/srcpkgs/xbps/patches/0003-Ignore-package-conflicts-against-themselves-due-to-v.patch index b37a2ebc2e3..70b9891a34c 100644 --- a/srcpkgs/xbps/patches/0003-Ignore-package-conflicts-against-themselves-due-to-v.patch +++ b/srcpkgs/xbps/patches/0003-Ignore-package-conflicts-against-themselves-due-to-v.patch @@ -17,7 +17,7 @@ index dd07677..658fdd6 100644 (pkgd = xbps_pkgdb_get_virtualpkg(xhp, cfpkg))) { prop_dictionary_get_cstring_nocopy(pkgd, "pkgver", &pkgver); -+ if (strcmp(pkgver, repopkgver)) ++ if (strcmp(pkgver, repopkgver) == 0) + continue; + xbps_dbg_printf(xhp, "found conflicting installed " @@ -27,7 +27,7 @@ index dd07677..658fdd6 100644 (pkgd = xbps_find_virtualpkg_in_array(xhp, unsorted, cfpkg))) { prop_dictionary_get_cstring_nocopy(pkgd, "pkgver", &pkgver); -+ if (strcmp(pkgver, repopkgver)) ++ if (strcmp(pkgver, repopkgver) == 0) + continue; + xbps_dbg_printf(xhp, "found conflicting pkgs in " diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template index 020ee1f3f32..73883d96031 100644 --- a/srcpkgs/xbps/template +++ b/srcpkgs/xbps/template @@ -1,7 +1,7 @@ # Template file for 'xbps' pkgname=xbps version=0.20 -revision=4 +revision=5 build_style=configure configure_args="--prefix=/ --exec-prefix=/usr --sbindir=/usr/sbin --enable-tests --enable-static --enable-debug"