diff options
| author | bapt <bapt@FreeBSD.org> | 2016-06-13 06:41:04 +0800 |
|---|---|---|
| committer | bapt <bapt@FreeBSD.org> | 2016-06-13 06:41:04 +0800 |
| commit | a39368e10ecb73e24d801da696b4317ad35f037a (patch) | |
| tree | 63ae1c03e223d33cd9090fecf80590eb9848c643 /ports-mgmt | |
| parent | 476168d5f6607f4d7b30926abc2ce181cf23abd4 (diff) | |
| download | freebsd-ports-gnome-a39368e10ecb73e24d801da696b4317ad35f037a.tar.gz freebsd-ports-gnome-a39368e10ecb73e24d801da696b4317ad35f037a.tar.zst freebsd-ports-gnome-a39368e10ecb73e24d801da696b4317ad35f037a.zip | |
Fix pkg upgrade -f
Diffstat (limited to 'ports-mgmt')
| -rw-r--r-- | ports-mgmt/pkg/Makefile | 1 | ||||
| -rw-r--r-- | ports-mgmt/pkg/files/patch-upgrade_f | 13 |
2 files changed, 14 insertions, 0 deletions
diff --git a/ports-mgmt/pkg/Makefile b/ports-mgmt/pkg/Makefile index 8f27ba5a181f..a72fca5f077c 100644 --- a/ports-mgmt/pkg/Makefile +++ b/ports-mgmt/pkg/Makefile @@ -2,6 +2,7 @@ PORTNAME= pkg DISTVERSION= 1.8.5 +PORTREVISION= 1 _PKG_VERSION= ${DISTVERSION} CATEGORIES= ports-mgmt MASTER_SITES= \ diff --git a/ports-mgmt/pkg/files/patch-upgrade_f b/ports-mgmt/pkg/files/patch-upgrade_f new file mode 100644 index 000000000000..0fbebd1d6b64 --- /dev/null +++ b/ports-mgmt/pkg/files/patch-upgrade_f @@ -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 { |