Changeset 565a343


Ignore:
Timestamp:
11/18/13 10:35:40 (10 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, releng/10.0, releng/10.0.1, releng/10.0.2, releng/10.0.3
Children:
4ceb51a
Parents:
675ff61
Message:

When checking for pkgng conflicts, use -FUy flags

Location:
src-sh
Files:
3 edited

Legend:

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

    r4f3e4a0 r565a343  
    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

    r1211b75 r565a343  
    590590  fi 
    591591 
    592   check_pkg_conflicts "upgrade -U -F -y $1" 
     592  check_pkg_conflicts "upgrade -FUy $1" 
    593593  if [ $? -ne 0 ] ; then 
    594594     exit 1 
  • src-sh/xtrafiles/local/share/pcbsd/bin/pkg

    rc2bb59a r565a343  
    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.