Changeset 4103

Timestamp:

06/13/09 15:26:12 (9 months ago)

Author:

kris

Message:

Fixed a bug with our last update to the SystemUpdaterTray? notifer. Don't continue on
with the patch check if we couldn't check for updates

Location:

pcbsd

Files:

• trunk-current/SystemUpdaterTray/UpdaterTray.cpp (modified) (1 diff)
• trunk/SystemUpdaterTray/UpdaterTray.cpp (modified) (1 diff)

pcbsd/trunk-current/SystemUpdaterTray/UpdaterTray.cpp

@@ -258 +258 @@
   QString Version = getLineFromCommandOutput(command);
 
-   // Now traverse the directory, see if we have updates.
-  readSysUpdates = new Q3Process( this );
-  readSysUpdates->addArgument( "sh");
-  readSysUpdates->addArgument( "/PCBSD/SystemUpdater/bin/readSysUpdatesUser.sh");
-  readSysUpdates->addArgument( Version );
-  readSysUpdates->addArgument(sysPatchsetTmpFile);
-  readSysUpdates->addArgument(username);
 
   // Check to see if the update download was successful and warn if not
   if ( sysFetchJob->error() != 0 )
   {
-       // We couldn't fetch any updates, set the status and update the icon
-       programstatus = CHECK_FAILED;
-       contextMenuRefresh();
-       displayTooltip();
-  } 
-
-  // Connect the exited signal and start the process
-  connect( readSysUpdates, SIGNAL(processExited()), this, SLOT(slotReadSystemUpdates() ) );
-  if ( ! readSysUpdates->start() ) {
+     // We couldn't fetch any updates, set the status and update the icon
+     programstatus = CHECK_FAILED;
+     contextMenuRefresh();
+     displayTooltip();
+  } else {
+    // Now traverse the directory, see if we have updates.
+    readSysUpdates = new Q3Process( this );
+    readSysUpdates->addArgument( "sh");
+    readSysUpdates->addArgument( "/PCBSD/SystemUpdater/bin/readSysUpdatesUser.sh");
+    readSysUpdates->addArgument( Version );
+    readSysUpdates->addArgument(sysPatchsetTmpFile);
+    readSysUpdates->addArgument(username);
+
+    // Connect the exited signal and start the process
+    connect( readSysUpdates, SIGNAL(processExited()), this, SLOT(slotReadSystemUpdates() ) );
+    if ( ! readSysUpdates->start() ) {
         QMessageBox::information( 0, tr("Error!"), tr("Error running updates2 script! "), QMessageBox::Ok );
-  }
-
-
+    }
+  }
 
 }

pcbsd/trunk/SystemUpdaterTray/UpdaterTray.cpp

@@ -258 +258 @@
   QString Version = getLineFromCommandOutput(command);
 
-   // Now traverse the directory, see if we have updates.
-  readSysUpdates = new Q3Process( this );
-  readSysUpdates->addArgument( "sh");
-  readSysUpdates->addArgument( "/PCBSD/SystemUpdater/bin/readSysUpdatesUser.sh");
-  readSysUpdates->addArgument( Version );
-  readSysUpdates->addArgument(sysPatchsetTmpFile);
-  readSysUpdates->addArgument(username);
 
   // Check to see if the update download was successful and warn if not
   if ( sysFetchJob->error() != 0 )
   {
-       // We couldn't fetch any updates, set the status and update the icon
-       programstatus = CHECK_FAILED;
-       contextMenuRefresh();
-       displayTooltip();
-  } 
-
-  // Connect the exited signal and start the process
-  connect( readSysUpdates, SIGNAL(processExited()), this, SLOT(slotReadSystemUpdates() ) );
-  if ( ! readSysUpdates->start() ) {
+     // We couldn't fetch any updates, set the status and update the icon
+     programstatus = CHECK_FAILED;
+     contextMenuRefresh();
+     displayTooltip();
+  } else {
+    // Now traverse the directory, see if we have updates.
+    readSysUpdates = new Q3Process( this );
+    readSysUpdates->addArgument( "sh");
+    readSysUpdates->addArgument( "/PCBSD/SystemUpdater/bin/readSysUpdatesUser.sh");
+    readSysUpdates->addArgument( Version );
+    readSysUpdates->addArgument(sysPatchsetTmpFile);
+    readSysUpdates->addArgument(username);
+
+    // Connect the exited signal and start the process
+    connect( readSysUpdates, SIGNAL(processExited()), this, SLOT(slotReadSystemUpdates() ) );
+    if ( ! readSysUpdates->start() ) {
         QMessageBox::information( 0, tr("Error!"), tr("Error running updates2 script! "), QMessageBox::Ok );
-  }
-
-
+    }
+  }
 
 }