Changeset 8af4a68


Ignore:
Timestamp:
12/14/13 05:57:18 (17 months ago)
Author:
Kris Moore <kris@…>
Branches:
9.2-release
Children:
200d959
Parents:
74a67ca
Message:

Backport some fixes to 9.2 for pkgng 1.2.x updating

Location:
src-sh
Files:
3 edited

Legend:

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

    rc8fc43e5 r8af4a68  
    454454{ 
    455455  # Lets test if we have any conflicts 
    456   pkg-static ${1} 2>/tmp/.pkgConflicts.$$ >/tmp/.pkgConflicts.$$ 
    457   if [ $? -eq 0 ] ; then rm /tmp/.pkgConflicts.$$ ; return ; fi 
     456  pkg-static ${1} 2>&1 | tee /tmp/.pkgConflicts.$$ 
     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 
     
    502510     # Nuked! 
    503511     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 
    504520     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 
    505527  done 
    506528 
  • src-sh/pc-extractoverlay/pc-extractoverlay

    rf0f52bf r8af4a68  
    3939  if [ $? -eq 0 ] ; then 
    4040    echo -e "DONE" 
     41    post_extract_setup 
    4142    exit 0 
    4243  else 
    4344    echo -e "FAILED" 
     45    post_extract_setup 
    4446    exit 1 
    4547  fi 
     
    112114  fi 
    113115 
    114   # See if we need to adjust pcbsd.conf 
    115   grep -q "ARCH" /usr/local/etc/pkg/repos/pcbsd.conf 
     116  # See if we need to adjust pcbsd.conf repo file 
     117  grep -q "ARCH" /usr/local/etc/pkg/repos/pcbsd.conf 2>/dev/null 
    116118  if [ $? -eq 0 ] ; then 
    117119    ARCH=`uname -m` 
  • src-sh/pc-updatemanager/pc-updatemanager

    rc8fc43e5 r8af4a68  
    580580  fi 
    581581 
     582  export EVENT_PIPE 
    582583  check_pkg_conflicts "upgrade -FUy $1" 
    583584  if [ $? -ne 0 ] ; then 
Note: See TracChangeset for help on using the changeset viewer.