Changeset 512610c


Ignore:
Timestamp:
06/03/14 08:07:59 (7 weeks ago)
Author:
Ken Moore <ken@…>
Branches:
master, releng/10.0.2
Children:
9fa1b39, 2a39b0d1
Parents:
0ccfae12 (diff), 09a6b83 (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

    r00c158d r12d4ffe  
    284284    echo " " 
    285285 
    286     if [ -e "/usr/local/bin/pc-systemflag" ]; then 
     286    if [ -e "/usr/local/bin/pc-systemflag" -a -z "$INJAIL" ]; then 
    287287      pc-systemflag SYSUPDATE UPDATE #set the system flag that system updates are available 
    288288    fi 
     
    310310     # No available updates 
    311311     echo "Your system is up to date!" 
    312      if [ -e "/usr/local/bin/pc-systemflag" ]; then 
     312     if [ -e "/usr/local/bin/pc-systemflag" -a -z "$INJAIL" ]; then 
    313313       pc-systemflag SYSUPDATE SUCCESS #set the system flag that system is up to date 
    314314     fi 
    315315  else 
    316     if [ -e "/usr/local/bin/pc-systemflag" ]; then 
     316    if [ -e "/usr/local/bin/pc-systemflag" -a -z "$INJAIL" ]; then 
    317317      pc-systemflag SYSUPDATE UPDATE #set the system flag that system updates are available 
    318318    fi 
     
    10111011        if [ -z "$1" ] ; then exit_err "No updates specified to install!"; fi 
    10121012 
    1013         if [ -e "/usr/local/bin/pc-systemflag" ]; then 
     1013        if [ -e "/usr/local/bin/pc-systemflag" -a -z "$INJAIL" ]; then 
    10141014          pc-systemflag SYSUPDATE UPDATING #set the flag that system is updating 
    10151015        fi 
     
    10331033 
    10341034        done  
    1035         if [ -e "/usr/local/bin/pc-systemflag" ]; then 
     1035        if [ -e "/usr/local/bin/pc-systemflag" -a -z "$INJAIL" ]; then 
    10361036          pc-systemflag SYSUPDATE SUCCESS #set the flag that system updates finished 
    10371037        fi 
     
    10451045        ret=$? 
    10461046        if [ $ret -ne 0 ]; then 
    1047           if [ -e "/usr/local/bin/pc-systemflag" ]; then 
     1047          if [ -e "/usr/local/bin/pc-systemflag" -a -z "$INJAIL" ]; then 
    10481048            pc-systemflag NETRESTART ERROR #set the system flag that no internet available 
    10491049          fi 
     
    10971097  if [ $? -ne 0 ] ; then 
    10981098     echo "Error checking for package updates..." 
    1099      if [ -e "/usr/local/bin/pc-systemflag" ]; then 
     1099     if [ -e "/usr/local/bin/pc-systemflag" -a -z "$INJAIL" ]; then 
    11001100       pc-systemflag PKGUPDATE ERROR #set the system flag pkg check errored 
    11011101     fi 
     
    11071107  if [ $? -ne 0 ] ; then 
    11081108     echo "All packages are up to date!" 
    1109      if [ -e "/usr/local/bin/pc-systemflag" ]; then 
     1109     if [ -e "/usr/local/bin/pc-systemflag" -a -z "$INJAIL" ]; then 
    11101110       pc-systemflag PKGUPDATE SUCCESS #set the system flag that packages are up to date 
    11111111     fi 
     
    11191119  echo "" 
    11201120  echo "To start the upgrade run \"${0} ${PKG_FLAG} pkgupdate\"" 
    1121   if [ -e "/usr/local/bin/pc-systemflag" ]; then 
     1121  if [ -e "/usr/local/bin/pc-systemflag" -a -z "$INJAIL" ]; then 
    11221122    pc-systemflag PKGUPDATE UPDATE #set the system flag that updates available 
    11231123  fi 
     
    11301130     exit_err "Invalid option $1 passed" 
    11311131  fi 
    1132   if [ -e "/usr/local/bin/pc-systemflag" ]; then 
     1132  if [ -e "/usr/local/bin/pc-systemflag" -a -z "$INJAIL" ]; then 
    11331133    pc-systemflag PKGUPDATE UPDATING #set the system flag that packages are updating 
    11341134  fi 
     
    11771177  if [ $result -ne 0 ] ; then 
    11781178     echo "Failed updating..." 
    1179     if [ -e "/usr/local/bin/pc-systemflag" ]; then 
     1179    if [ -e "/usr/local/bin/pc-systemflag" -a -z "$INJAIL" ]; then 
    11801180      pc-systemflag PKGUPDATE UPDATE #set the system flag that updates available 
    11811181    fi 
    11821182  else 
    1183     if [ -e "/usr/local/bin/pc-systemflag" ]; then 
     1183    if [ -e "/usr/local/bin/pc-systemflag" -a -z "$INJAIL" ]; then 
    11841184      pc-systemflag PKGUPDATE SUCCESS #set the system flag that packages are up to date 
    11851185    fi 
  • src-qt4/pc-softwaremanager/mainUI.cpp

    rb5c529e r0ccfae12  
    215215    //Get the update stats and ask for verification to start now 
    216216    QMessageBox MB(QMessageBox::Question, tr("Start Updates?"), tr("Are you ready to start performing updates?")+"\n\n"+tr("NOTE: Please close any running applications first!!"), QMessageBox::Yes | QMessageBox::No, this); 
    217       MB.setWindowFlags( Qt::Window ); 
    218217      MB.setDetailedText(PBI->updateDetails(VISJAIL)); 
    219       MB.setSizeGripEnabled(true); //allow resizing the dialog 
    220       MB.setMaximumSize( QSize(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX) ); //override fixed-size settings 
     218      //NOTE: QMessageBox's *cannot* be resized!! 
    221219    if( QMessageBox::Yes != MB.exec() ){ 
    222220      return; //cancelled 
Note: See TracChangeset for help on using the changeset viewer.