Changeset cdfb605


Ignore:
Timestamp:
03/08/14 12:04:17 (6 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.

Location:
src-sh
Files:
2 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" 
  • src-sh/pc-updatemanager/pc-updatemanager

    re07f550 rcdfb605  
    11491149  fi 
    11501150 
     1151  # Don't use EVENT_PIPE for the update -f command 
     1152  if [ -n "$EVENT_PIPE" ] ; then 
     1153     oEP="$EVENT_PIPE"  
     1154     unset EVENT_PIPE 
     1155  fi 
     1156 
    11511157  # Update the DB first 
    11521158  pkg-static update -f 
    11531159 
     1160  # Enable EVENT_PIPE again 
     1161  if [ -n "$oEP" ] ; then 
     1162     EVENT_PIPE="$oEP" 
     1163     unset oEP 
     1164     export EVENT_PIPE 
     1165  fi 
     1166 
    11541167  # Look for conflicts 
    11551168  check_pkg_conflicts "upgrade -FUy $1" 
     
    11571170     exit 1 
    11581171  fi 
     1172 
     1173  # Done with EVENT_PIPE 
     1174  unset EVENT_PIPE 
    11591175 
    11601176  # Start the package update! 
Note: See TracChangeset for help on using the changeset viewer.