Changeset be75ddc


Ignore:
Timestamp:
02/14/14 10:21:00 (7 months ago)
Author:
Kris Moore <kris@…>
Branches:
releng/10.0
Children:
8acecf9
Parents:
1c3c665
git-author:
Kris Moore <kris@…> (02/14/14 10:19:55)
git-committer:
Kris Moore <kris@…> (02/14/14 10:21:00)
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 rbe75ddc  
    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.