Backport fix to pkgng conflict checking

trueos · Nov 18, 2013 · 8506d7a · 8506d7a
1 parent 59511b7
commit 8506d7a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src-sh/pc-metapkgmanager/pc-metapkgmanager b/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

diff --git a/src-sh/pc-updatemanager/pc-updatemanager b/src-sh/pc-updatemanager/pc-updatemanager
@@ -548,7 +548,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

diff --git a/src-sh/xtrafiles/local/share/pcbsd/bin/pkg b/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