Ignore:
Timestamp:
10/09/13 06:24:05 (13 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1, releng/10.0.2, releng/10.0.3
Children:
82ea8a6
Parents:
b5dbe14
Message:

Fix some bugs doing freebsd-update / major updates via the GUI.

When an update is going to require a reboot, we must ensure the GUI
does NOT check for updates again, possibly trampling the freebsd-update
cache directories / files

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/pc-systemupdatertray/UpdaterTray.cpp

    r7cc177e r88de14c  
    338338 
    339339  //Check for installed system updates needing computer to restart to finish 
    340   bool needRestart = false; 
    341   if( QFile::exists("/usr/local/tmp/update-stagedir/doupdate.sh") ){ 
    342     needRestart = true; 
     340  if ( QFile::exists("/tmp/.fbsdup-reboot") ) { 
     341     programstatus = SYSTEM_RESTART_NEEDED; 
     342     contextMenuRefresh(); 
     343     displayTooltip(); 
     344     doingCheck=false; 
     345     return; 
    343346  } 
    344347 
     
    433436  ///////////////////////////////////////////// 
    434437 
    435   if ( needRestart ) { 
    436     programstatus = SYSTEM_RESTART_NEEDED; 
    437   } else if ( haveUp ) { 
     438  if ( haveUp ) { 
    438439    programstatus = SYSTEM_UPDATE_AVAIL; 
    439440  } else if ( haveNGUp ) { 
Note: See TracChangeset for help on using the changeset viewer.