wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-08-04 03:42:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

xbps: fix inverted test in latest patch.

Browse source
This commit is contained in:
Juan RP 2013-02-02 14:47:04 +01:00
parent fa1e886443
commit fcf4486158
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
srcpkgs/xbps/patches/0003-Ignore-package-conflicts-against-themselves-due-to-v.patch
View file

@ -17,7 +17,7 @@ index dd07677..658fdd6 100644
(pkgd = xbps_pkgdb_get_virtualpkg(xhp, cfpkg))) { (pkgd = xbps_pkgdb_get_virtualpkg(xhp, cfpkg))) {
prop_dictionary_get_cstring_nocopy(pkgd, prop_dictionary_get_cstring_nocopy(pkgd,
"pkgver", &pkgver); "pkgver", &pkgver);
+ if (strcmp(pkgver, repopkgver)) + if (strcmp(pkgver, repopkgver) == 0)
+ continue; + continue;
+ +
xbps_dbg_printf(xhp, "found conflicting installed " xbps_dbg_printf(xhp, "found conflicting installed "
@ -27,7 +27,7 @@ index dd07677..658fdd6 100644
(pkgd = xbps_find_virtualpkg_in_array(xhp, unsorted, cfpkg))) { (pkgd = xbps_find_virtualpkg_in_array(xhp, unsorted, cfpkg))) {
prop_dictionary_get_cstring_nocopy(pkgd, prop_dictionary_get_cstring_nocopy(pkgd,
"pkgver", &pkgver); "pkgver", &pkgver);
+ if (strcmp(pkgver, repopkgver)) + if (strcmp(pkgver, repopkgver) == 0)
+ continue; + continue;
+ +
xbps_dbg_printf(xhp, "found conflicting pkgs in " xbps_dbg_printf(xhp, "found conflicting pkgs in "

2
srcpkgs/xbps/template
View file

@ -1,7 +1,7 @@
# Template file for 'xbps' # Template file for 'xbps'
pkgname=xbps pkgname=xbps
version=0.20 version=0.20
revision=4 revision=5
build_style=configure build_style=configure
configure_args="--prefix=/ --exec-prefix=/usr --sbindir=/usr/sbin configure_args="--prefix=/ --exec-prefix=/usr --sbindir=/usr/sbin
--enable-tests --enable-static --enable-debug" --enable-tests --enable-static --enable-debug"