Changeset 009d9db


Ignore:
Timestamp:
12/12/13 08:17:32 (13 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, releng/10.0, releng/10.0.1, releng/10.0.2, releng/10.0.3, releng/10.1
Children:
d469dfd
Parents:
fa2ad6e
Message:

Cleanup how we handle conflict detection during package upgrades,
display output of pkg detection

File:
1 edited

Legend:

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

    r181480f r009d9db  
    454454{ 
    455455  # Lets test if we have any conflicts 
    456   pkg-static ${1} 2>/tmp/.pkgConflicts.$$ >/tmp/.pkgConflicts.$$ 
     456  pkg-static ${1} 2>&1 | tee /tmp/.pkgConflicts.$$ 
    457457  local _err=$? 
    458458  if [ $_err -eq 0 ] ; then rm /tmp/.pkgConflicts.$$ ; return ; fi 
     
    510510     # Nuked! 
    511511     echo "Removing conflicting package: $bPkg" 
     512 
     513     # If EVENT_PIPE is set, unset it, seems to cause some weird crash in pkgng 1.2.3 
     514     if [ -n "$EVENT_PIPE" ] ; then 
     515        oEP="$EVENT_PIPE" 
     516        unset EVENT_PIPE 
     517     fi 
     518 
     519     # Delete the package now 
    512520     pkg delete -q -y -f ${bPkg} 
     521 
     522     # Reset EVENT_PIPE if we need to 
     523     if [ -n "$oEP" ] ; then 
     524        EVENT_PIPE="$oEP"; export EVENT_PIPE 
     525        unset oEP 
     526     fi 
    513527  done 
    514528 
Note: See TracChangeset for help on using the changeset viewer.