Ignore:
Timestamp:
02/14/14 10:19:55 (5 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, releng/10.0.1, releng/10.0.2
Children:
d71f644
Parents:
58035e0
Message:

Don't trust the return value of pkg upgrade -FUy, check output data
for any package conflicts and do conflict resolution if found

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src-sh/libsh/functions.sh

    r9d168987 r953cbc3d  
    458458  # Lets test if we have any conflicts 
    459459  pkg-static ${1} | tee /tmp/.pkgConflicts.$$ 
    460   if [ $? -eq 0 ] ; then rm /tmp/.pkgConflicts.$$ ; return ; fi 
     460 
     461  cat /tmp/.pkgConflicts.$$ | grep -q "WARNING: locally installed" 
     462  if [ $? -ne 0 ] ; then rm /tmp/.pkgConflicts.$$ ; return ; fi 
    461463 
    462464  
Note: See TracChangeset for help on using the changeset viewer.