Changeset 0c876f6


Ignore:
Timestamp:
01/13/14 10:32:55 (11 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, releng/10.0, releng/10.0.1, releng/10.0.2, releng/10.0.3, releng/10.1
Children:
58ffcd7, 87e73145
Parents:
ff74b40 (diff), 074bcb6 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of github.com:pcbsd/pcbsd

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • src-sh/pc-updatemanager/pc-updatemanager

    r04308e6 r074bcb6  
    442442  clear 
    443443  echo "Removing PBIs..." 
    444   while read pbi 
    445   do 
     444  while read line 
     445  do 
     446    pbi=`echo $line | cut -d ' ' -f 1` 
    446447    echo "Removing: ${pbi}" 
    447448    pbi_delete $pbi >/dev/null 2>/dev/null 
     
    577578  clear 
    578579  echo "Re-Installing PBIs" 
    579   while read newpbi 
    580   do 
     580  while read line 
     581  do 
     582    newpbi=`echo $line | cut -d ' ' -f 1` 
     583    user=`echo $line | cut -d ' ' -f 2` 
    581584    shortpbi="`echo $newpbi | rev | cut -d '-' -f 3- | rev`" 
    582     pbi_add -r $shortpbi 
    583     if [ $? -ne 0 ] ; then 
     585 
     586    # Re-install the PBI as user or root depending on how it was installed 
     587    if [ "$user" != "root" ] ; then 
     588      su $user -c "pbi_add -r $shortpbi" 
     589      result=$? 
     590    else 
     591      pbi_add -r $shortpbi 
     592      result=$? 
     593    fi 
     594    if [ $result -ne 0 ] ; then 
    584595       PBISTATUS=1 
    585596       echo "$shortpbi" >> /root/.failed-pbi 
     
    643654 
    644655  if [ $PBISTATUS -eq 0 ] ; then 
    645     echo "PBI: All meta-packages updated successfully!" >> /root/pcbsd-update-summary 
     656    echo "PBI: All PBIs updated successfully!" >> /root/pcbsd-update-summary 
    646657  else 
    647     echo "PBI: The following meta-packages failed to install:" >> /root/pcbsd-update-summary 
     658    echo "PBI: The following PBIs failed to install:" >> /root/pcbsd-update-summary 
    648659    cat /root/.failed-pbi >> /root/pcbsd-update-summary 
    649660  fi 
     
    730741  # Now lets build some lists of what is present on this system now 
    731742  pkg info > /root/pcbsd-pkg-before-update 
    732   pbi_info > /root/pcbsd-pbi-before-update 
     743  pbi_info > /root/pcbsd-pbi-before-update.tmp 
    733744  pc-metapkgmanager list-installed > /root/pcbsd-meta-before-update 
     745 
     746  # Figure out which user had installed which PBIs and save this list 
     747  while read line 
     748  do 
     749     insBy=`pbi_info -v $line | grep "InstalledBy:" | cut -d ' ' -f 2` 
     750     if [ -z "$insBy" ] ; then 
     751        echo "Unable to get UserName for installed PBI: $line" 
     752        continue 
     753     fi 
     754     echo "$line $insBy" >> /root/pcbsd-pbi-before-update 
     755  done < /root/pcbsd-pbi-before-update.tmp 
     756  touch /root/pcbsd-pbi-before-update 
     757  rm /root/pcbsd-pbi-before-update.tmp 
    734758 
    735759  # Figure out a list of user-installed packages to try and re-install on the updated system 
  • src-qt4/life-preserver/lp-gui/LPMain.cpp

    r8b3a780 rff74b40  
    197197      ui->label_finishedstat->setVisible(true); 
    198198    } 
    199     if(POOLDATA.runningStatus.isEmpty()){ ui->label_runningstat->setVisible(false); } 
    200     else{ 
     199    if(POOLDATA.runningStatus.isEmpty()){  
     200      ui->label_runningstat->setVisible(false); 
     201      ui->action_startScrub->setEnabled(true); 
     202      ui->action_stopScrub->setEnabled(false); 
     203    }else{ 
    201204      ui->label_runningstat->setText(POOLDATA.runningStatus); 
    202205      ui->label_runningstat->setVisible(true); 
     206      ui->action_startScrub->setEnabled(false); //Something already running 
     207      ui->action_stopScrub->setEnabled(POOLDATA.runningStatus.contains("scrub", Qt::CaseInsensitive)); 
    203208    }        
    204209    if(POOLDATA.errorStatus.isEmpty()){ ui->label_errorstat->setVisible(false); } 
Note: See TracChangeset for help on using the changeset viewer.