Changeset 8506d7a2


Ignore:
Timestamp:
11/18/13 10:36:50 (10 months ago)
Author:
Kris Moore <kris@…>
Branches:
9.2-release
Children:
f052849
Parents:
59511b7
Message:

Backport fix to pkgng conflict checking

Location:
src-sh
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • src-sh/pc-metapkgmanager/pc-metapkgmanager

    r4f3e4a0 r8506d7a2  
    7979 
    8080        # Lets check for any conflicts doing this install 
    81         check_pkg_conflicts "install -U -F -y $pkgName" 
     81        check_pkg_conflicts "install -FUy $pkgName" 
    8282        if [ $? -ne 0 ] ; then 
    8383                exit 1 
     
    308308 
    309309   # Lets check for any conflicts doing this install 
    310    check_pkg_conflicts "${op} -F $flags" 
     310   check_pkg_conflicts "${op} -FUy $flags" 
    311311   if [ $? -ne 0 ] ; then 
    312312        exit 1 
  • src-sh/pc-updatemanager/pc-updatemanager

    ra6c8b4a r8506d7a2  
    549549  fi 
    550550 
    551   check_pkg_conflicts "upgrade -U -F -y $1" 
     551  check_pkg_conflicts "upgrade -FUy $1" 
    552552  if [ $? -ne 0 ] ; then 
    553553     exit 1 
  • src-sh/xtrafiles/local/share/pcbsd/bin/pkg

    rc2bb59a r8506d7a2  
    5959 
    6060   # Lets check for any conflicts doing this install 
    61    check_pkg_conflicts "${op} -F $flags" 
     61   check_pkg_conflicts "${op} -FUy $flags" 
    6262   if [ $? -ne 0 ] ; then 
    6363        exit 1 
Note: See TracChangeset for help on using the changeset viewer.