kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix pkg upgrade -f

Browse source
This commit is contained in:
Baptiste Daroussin 2016-06-12 22:41:04 +00:00
parent d172911638
commit d7f63035c7
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=416827
2 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ports-mgmt/pkg/Makefile
View file

@ -2,6 +2,7 @@
PORTNAME= pkg
DISTVERSION= 1.8.5
PORTREVISION= 1
_PKG_VERSION= ${DISTVERSION}
CATEGORIES= ports-mgmt
MASTER_SITES= \

13
ports-mgmt/pkg/files/patch-upgrade_f Normal file
View file

@ -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 {