Ignore:
Timestamp:
10/09/13 06:24:05 (11 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-updategui/mainWin.cpp

    rd47ba250 r88de14c  
    239239         if ( listUpdates.at(z).at(1) == "FBSDUPDATE" ) { 
    240240           uProc->start("freebsd-update", QStringList() << "install");  
     241           system("touch /tmp/.fbsdup-reboot"); 
    241242         } else { 
    242243           uProc->start("pc-updatemanager", QStringList() << "install" << tag );  
     
    357358  groupUpdates->setEnabled(false); 
    358359  listUpdates.clear(); 
     360 
     361  if ( QFile::exists("/tmp/.fbsdup-reboot") ) { 
     362     textLabel->setText(tr("Reboot required for update to finish!")); 
     363     return; 
     364  } 
     365 
    359366  textLabel->setText(tr("Checking for updates... Please Wait...")); 
    360367  slotReadUpdateData(); 
     
    544551  QString line, toPatchVer, tmp; 
    545552  QStringList up, listDesc, listPkgs; 
     553 
     554  if ( QFile::exists("/tmp/.fbsdup-reboot") ) { 
     555     qDebug() << "Skipping update check - Waiting for reboot"; 
     556     return; 
     557  } 
    546558 
    547559  if ( QFile::exists("/tmp/.fbsdup-lock") ) { 
Note: See TracChangeset for help on using the changeset viewer.