Ignore:
Timestamp:
03/08/14 12:04:17 (7 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, releng/10.0.1, releng/10.0.2, releng/10.0.3
Children:
e01392dc
Parents:
e5d15d2
Message:

Fix some issues with conflicts detection during package upgrades, as well as
using EVENT_PIPE only during the download phase. This will need to be backported
to the current PRODUCTION set before issuing new updates.

File:
1 edited

Legend:

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

    r953cbc3d rcdfb605  
    454454{ 
    455455 
    456   if [ -z "$EVENT_PIPE" ] ; then unset EVENT_PIPE ; fi 
    457  
    458456  # Lets test if we have any conflicts 
    459   pkg-static ${1} | tee /tmp/.pkgConflicts.$$ 
     457  pkg-static ${1} 2>&1| tee /tmp/.pkgConflicts.$$ 
    460458 
    461459  cat /tmp/.pkgConflicts.$$ | grep -q "WARNING: locally installed" 
Note: See TracChangeset for help on using the changeset viewer.