Changeset 200d959


Ignore:
Timestamp:
12/14/13 06:20:04 (12 months ago)
Author:
Kris Moore <kris@…>
Branches:
9.2-release
Children:
1ba44be
Parents:
8af4a68
Message:

Backport a fix to 9.2 for conflict resolution

File:
1 edited

Legend:

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

    r8af4a68 r200d959  
    453453check_pkg_conflicts() 
    454454{ 
     455 
     456  if [ -z "$EVENT_PIPE" ] ; then unset EVENT_PIPE ; fi 
     457 
    455458  # Lets test if we have any conflicts 
    456   pkg-static ${1} 2>&1 | tee /tmp/.pkgConflicts.$$ 
    457   local _err=$? 
    458   if [ $_err -eq 0 ] ; then rm /tmp/.pkgConflicts.$$ ; return ; fi 
     459  pkg-static ${1} 2>/tmp/.pkgConflicts.$$ >/tmp/.pkgConflicts.$$ 
     460  if [ $? -eq 0 ] ; then rm /tmp/.pkgConflicts.$$ ; return ; fi 
    459461 
    460462  
     
    467469        > /tmp/.pkgConflicts.$$.2 
    468470 
    469   if [ -z `tail /tmp/.pkgConflicts.$$.2` ] ; then 
     471  # Check how many conflicts we found 
     472  found=`wc -l /tmp/.pkgConflicts.$$.2 | awk '{print $1}'` 
     473  if [ "$found" = "0" ] ; then 
    470474     rm /tmp/.pkgConflicts.$$ 
    471      return $_err 
     475     rm /tmp/.pkgConflicts.$$.2 
     476     return 0 
    472477  fi 
    473478 
Note: See TracChangeset for help on using the changeset viewer.