Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

When checking for pkgng conflicts, use -FUy flags

  • Loading branch information...
commit 565a343fa3bc4f46b36acc6184faff0b78c8b55b 1 parent 675ff61
@kmoore134 kmoore134 authored
View
4 src-sh/pc-metapkgmanager/pc-metapkgmanager
@@ -78,7 +78,7 @@ add_metapkgs() {
download_cache_packages "pkg-static install -U -n $pkgName"
# Lets check for any conflicts doing this install
- check_pkg_conflicts "install -U -F -y $pkgName"
+ check_pkg_conflicts "install -FUy $pkgName"
if [ $? -ne 0 ] ; then
exit 1
fi
@@ -307,7 +307,7 @@ intercept_pkg_dl()
download_cache_packages "pkg $op $flags"
# Lets check for any conflicts doing this install
- check_pkg_conflicts "${op} -F $flags"
+ check_pkg_conflicts "${op} -FUy $flags"
if [ $? -ne 0 ] ; then
exit 1
fi
View
2  src-sh/pc-updatemanager/pc-updatemanager
@@ -589,7 +589,7 @@ update_pkgs()
download_cache_packages "pkg-static upgrade -U -n $1"
fi
- check_pkg_conflicts "upgrade -U -F -y $1"
+ check_pkg_conflicts "upgrade -FUy $1"
if [ $? -ne 0 ] ; then
exit 1
fi
View
2  src-sh/xtrafiles/local/share/pcbsd/bin/pkg
@@ -58,7 +58,7 @@ intercept_pkg_dl()
download_cache_packages "pkg $op $flags"
# Lets check for any conflicts doing this install
- check_pkg_conflicts "${op} -F $flags"
+ check_pkg_conflicts "${op} -FUy $flags"
if [ $? -ne 0 ] ; then
exit 1
fi
Please sign in to comment.
Something went wrong with that request. Please try again.