Date: Sun, 12 Jun 2016 22:41:04 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r416827 - in head/ports-mgmt/pkg: . files Message-ID: <201606122241.u5CMf4Xx089570@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Sun Jun 12 22:41:04 2016 New Revision: 416827 URL: https://svnweb.freebsd.org/changeset/ports/416827 Log: Fix pkg upgrade -f Added: head/ports-mgmt/pkg/files/patch-upgrade_f (contents, props changed) Modified: head/ports-mgmt/pkg/Makefile Modified: head/ports-mgmt/pkg/Makefile ============================================================================== --- head/ports-mgmt/pkg/Makefile Sun Jun 12 21:56:01 2016 (r416826) +++ head/ports-mgmt/pkg/Makefile Sun Jun 12 22:41:04 2016 (r416827) @@ -2,6 +2,7 @@ PORTNAME= pkg DISTVERSION= 1.8.5 +PORTREVISION= 1 _PKG_VERSION= ${DISTVERSION} CATEGORIES= ports-mgmt MASTER_SITES= \ Added: head/ports-mgmt/pkg/files/patch-upgrade_f ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/ports-mgmt/pkg/files/patch-upgrade_f Sun Jun 12 22:41:04 2016 (r416827) @@ -0,0 +1,13 @@ +diff --git libpkg/pkg_jobs_universe.c libpkg/pkg_jobs_universe.c +index 312591d..c1eb15b 100644 +--- libpkg/pkg_jobs_universe.c ++++ libpkg/pkg_jobs_universe.c +@@ -1264,7 +1264,7 @@ pkg_jobs_universe_get_upgrade_candidates(struct pkg_jobs_universe *universe, + if (selected != lp) { + /* We need to add the whole chain of upgrade candidates */ + for (int i = 0; i < kv_size(candidates); i++) { +- pkg_jobs_universe_add_pkg(universe, kv_A(candidates, i), false, NULL); ++ pkg_jobs_universe_add_pkg(universe, kv_A(candidates, i), force, NULL); + } + } + else {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201606122241.u5CMf4Xx089570>