[PC-BSD Commits] r14987 - in pcbsd/current: src-qt4/pc-systemupdatertray src-sh/pc-updatemanager

[svn at pcbsd.org]

Author: kris
Date: 2012-01-22 06:29:52 +0000 (Sun, 22 Jan 2012)
New Revision: 14987

Modified:
   pcbsd/current/src-qt4/pc-systemupdatertray/UpdaterTray.cpp
   pcbsd/current/src-sh/pc-updatemanager/pc-updatemanager
Log:

Fix the tray trigger file, now will properly change based upon update status,
refresh after failed / successful installation



Modified: pcbsd/current/src-qt4/pc-systemupdatertray/UpdaterTray.cpp
===================================================================
--- pcbsd/current/src-qt4/pc-systemupdatertray/UpdaterTray.cpp	2012-01-22 05:49:16 UTC (rev 14986)
+++ pcbsd/current/src-qt4/pc-systemupdatertray/UpdaterTray.cpp	2012-01-22 06:29:52 UTC (rev 14987)
@@ -215,34 +215,18 @@
               autoStatus = AUTODOWNLOAD;
               autoCurrentUpdate = line;
           }
-          if ( line.indexOf("FINISHED: " ) == 0)
+          if ( line.indexOf("INSTALLFAILED: " ) == 0)
           {
-              line.replace("FINISHED: ", "");
-              autoStatus = AUTOFINISHEDDL;
+              autoStatus = AUTOFINISHED;
+              QTimer::singleShot(2000, this, SLOT(slotStartUpdateCheck()));
+	      qDebug() << "FAILED INSTALLING UPDATES";
           }
-          if ( line.indexOf("FAILED: " ) == 0)
-          {
-              line.replace("FAILED: ", "");
-              autoStatus = AUTOFAILED;
-              autoUpdatesFailed << line;
-          }
-          if ( line.indexOf("INSTALLING: " ) == 0)
-          {
-              line.replace("INSTALLING: ", "");
-              autoStatus = AUTOINSTALLING;
-          }
           if ( line.indexOf("INSTALLFINISHED: " ) == 0)
           {
-              line.replace("INSTALLFINISHED: ", "");
-              autoUpdatesInstalled << line;
+              autoStatus = AUTOFINISHED;
+              QTimer::singleShot(2000, this, SLOT(slotStartUpdateCheck()));
+	      qDebug() << "DONE INSTALLING UPDATES";
           }
-          if ( line.indexOf("INSTALLSCRIPTDONE: " ) == 0)
-          {
-            autoStatus = AUTOFINISHED;
-            QTimer::singleShot(2000, this, SLOT(slotStartUpdateCheck()));
-          }
-          if ( line.indexOf("REQUIRESREBOOT: " ) == 0)
-              line.replace("REQUIRESREBOOT: ", "");
       } 
 
       contextMenuRefresh();

Modified: pcbsd/current/src-sh/pc-updatemanager/pc-updatemanager
===================================================================
--- pcbsd/current/src-sh/pc-updatemanager/pc-updatemanager	2012-01-22 05:49:16 UTC (rev 14986)
+++ pcbsd/current/src-sh/pc-updatemanager/pc-updatemanager	2012-01-22 06:29:52 UTC (rev 14987)
@@ -42,7 +42,6 @@
 
 # Trigger File for Tray Application
 TRIGGERFILE="/tmp/.sysupdatetraytrigger"
-rm ${TRIGGERFILE} >/dev/null 2>/dev/null
 
 DBDIR="/var/db/pc-updatemanager"
 if [ `id -u` != "0" ] ; then