Changeset 2790

Timestamp:

09/18/08 08:46:39 (18 months ago)

Author:

kris

Message:

Fixed up a few more bugs with updating, and a potential crash when an update fails to download. Will roll into online update later today.

Location:

pcbsd

Files:

• branches/7.0/SystemUpdater/UpdaterTray.cpp (modified) (3 diffs)
• trunk/SystemUpdater/UpdaterTray.cpp (modified) (3 diffs)

pcbsd/branches/7.0/SystemUpdater/UpdaterTray.cpp

@@ -1051 +1051 @@
 
     UpdaterStatusDialog->setProgressTotalSteps(100);
+
+    // Make sure that any old patch is removed first
+    QFile tmpfile("/PCBSD/tmp/patch" + tmp.setNum(currentSysWorkingItem) + ".lzma");
+    if ( tmpfile.exists() )
+    {
+      tmpfile.remove();
+    }
      
     copyJob = KIO::copy(SysUpdateURL[currentSysWorkingItem], "/PCBSD/tmp/patch" + tmp.setNum(currentSysWorkingItem) + ".lzma", KIO::HideProgressInfo);
@@ -1120 +1127 @@
        {
 
+           // Show the updater status dialog, so user can see any errors
+           UpdaterStatusDialog->show();
 
            QMessageBox::critical( this->contextMenu(), tr("Online Update"), tr("An error occured while downloading. Please check your connection or try again later."), QMessageBox::Ok );
+
            if ( UpdaterStatusDialog->isShown() )
            {
@@ -1838 +1848 @@
 
     UpdaterStatusDialog->setProgressTotalSteps(100);
+
+    // Make sure that any old PBI is removed first
+    QFile tmpfile("/PCBSD/tmp/" + tmp.setNum(currentWorkingPBI) + ".pbi");
+    if ( tmpfile.exists() )
+    {
+      tmpfile.remove();
+    }
+     
     
     copyJob = KIO::copy(URL, "/PCBSD/tmp/" + tmp.setNum(currentWorkingPBI) + ".pbi", KIO::HideProgressInfo);

pcbsd/trunk/SystemUpdater/UpdaterTray.cpp

@@ -1051 +1051 @@
 
     UpdaterStatusDialog->setProgressTotalSteps(100);
+
+    // Make sure that any old patch is removed first
+    QFile tmpfile("/PCBSD/tmp/patch" + tmp.setNum(currentSysWorkingItem) + ".lzma");
+    if ( tmpfile.exists() )
+    {
+      tmpfile.remove();
+    }
      
     copyJob = KIO::copy(SysUpdateURL[currentSysWorkingItem], "/PCBSD/tmp/patch" + tmp.setNum(currentSysWorkingItem) + ".lzma", KIO::HideProgressInfo);
@@ -1120 +1127 @@
        {
 
+           // Show the updater status dialog, so user can see any errors
+           UpdaterStatusDialog->show();
 
            QMessageBox::critical( this->contextMenu(), tr("Online Update"), tr("An error occured while downloading. Please check your connection or try again later."), QMessageBox::Ok );
+
            if ( UpdaterStatusDialog->isShown() )
            {
@@ -1838 +1848 @@
 
     UpdaterStatusDialog->setProgressTotalSteps(100);
+
+    // Make sure that any old PBI is removed first
+    QFile tmpfile("/PCBSD/tmp/" + tmp.setNum(currentWorkingPBI) + ".pbi");
+    if ( tmpfile.exists() )
+    {
+      tmpfile.remove();
+    }
+     
     
     copyJob = KIO::copy(URL, "/PCBSD/tmp/" + tmp.setNum(currentWorkingPBI) + ".pbi", KIO::HideProgressInfo);