[PC-BSD Commits] r4103 - in pcbsd: trunk/SystemUpdaterTray trunk-current/SystemUpdaterTray

[svn at pcbsd.org]

Author: kris
Date: 2009-06-13 15:26:12 -0700 (Sat, 13 Jun 2009)
New Revision: 4103

Modified:
   pcbsd/trunk-current/SystemUpdaterTray/UpdaterTray.cpp
   pcbsd/trunk/SystemUpdaterTray/UpdaterTray.cpp
Log:

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



Modified: pcbsd/trunk/SystemUpdaterTray/UpdaterTray.cpp
===================================================================
--- pcbsd/trunk/SystemUpdaterTray/UpdaterTray.cpp	2009-06-13 18:47:09 UTC (rev 4102)
+++ pcbsd/trunk/SystemUpdaterTray/UpdaterTray.cpp	2009-06-13 22:26:12 UTC (rev 4103)
@@ -257,31 +257,30 @@
   QString command = "pbreg get /PC-BSD/Version";
   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();
-  } 
+     // 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() ) {
+    // 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 );
+    }
   }
 
-
-
 }
 
 

Modified: pcbsd/trunk-current/SystemUpdaterTray/UpdaterTray.cpp
===================================================================
--- pcbsd/trunk-current/SystemUpdaterTray/UpdaterTray.cpp	2009-06-13 18:47:09 UTC (rev 4102)
+++ pcbsd/trunk-current/SystemUpdaterTray/UpdaterTray.cpp	2009-06-13 22:26:12 UTC (rev 4103)
@@ -257,31 +257,30 @@
   QString command = "pbreg get /PC-BSD/Version";
   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();
-  } 
+     // 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() ) {
+    // 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 );
+    }
   }
 
-
-
 }