Changeset 181480f


Ignore:
Timestamp:
12/11/13 13:41:22 (12 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:
87ca445, ca5b4b5
Parents:
d6345ef
Message:

When checking for pkg conflicts, bail out if no actual conflicts
are detected and it failed for another reason

File:
1 edited

Legend:

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

    r8506de1f r181480f  
    455455  # Lets test if we have any conflicts 
    456456  pkg-static ${1} 2>/tmp/.pkgConflicts.$$ >/tmp/.pkgConflicts.$$ 
    457   if [ $? -eq 0 ] ; then rm /tmp/.pkgConflicts.$$ ; return ; fi 
     457  local _err=$? 
     458  if [ $_err -eq 0 ] ; then rm /tmp/.pkgConflicts.$$ ; return ; fi 
     459 
    458460  
    459461  # Found conflicts, suprise suprise, yet another reason I hate packages 
     
    464466        | sed 's|.*installed ||g' | sed 's| conflicts.*||g' | sort | uniq \ 
    465467        > /tmp/.pkgConflicts.$$.2 
     468 
     469  if [ -z `tail /tmp/.pkgConflicts.$$.2` ] ; then 
     470     rm /tmp/.pkgConflicts.$$ 
     471     return $_err 
     472  fi 
     473 
    466474  while read line 
    467475  do 
Note: See TracChangeset for help on using the changeset viewer.