[PC-BSD Commits] r21701 - in pcbsd/current: src-qt4/pc-systemupdatertray src-sh/pc-extractoverlay/ports-overlay/usr/local/etc

svn at pcbsd.org svn at pcbsd.org
Wed Mar 6 06:24:47 PST 2013


Author: kris
Date: 2013-03-06 14:24:47 +0000 (Wed, 06 Mar 2013)
New Revision: 21701

Modified:
   pcbsd/current/src-qt4/pc-systemupdatertray/UpdaterTray.cpp
   pcbsd/current/src-sh/pc-extractoverlay/ports-overlay/usr/local/etc/sudoers
Log:

Fix a bug in the system updater tray, now show when rolling release
packages are available to be updated



Modified: pcbsd/current/src-qt4/pc-systemupdatertray/UpdaterTray.cpp
===================================================================
--- pcbsd/current/src-qt4/pc-systemupdatertray/UpdaterTray.cpp	2013-03-06 13:25:56 UTC (rev 21700)
+++ pcbsd/current/src-qt4/pc-systemupdatertray/UpdaterTray.cpp	2013-03-06 14:24:47 UTC (rev 21701)
@@ -344,7 +344,7 @@
   // Check for PC-BSD updates
   /////////////////////////////////////////////
   QProcess p;
-  p.start(QString("pc-updatemanager"), QStringList() << "check");
+  p.start(QString("sudo"), QStringList() << "pc-updatemanager" << "check");
   while(p.state() == QProcess::Starting || p.state() == QProcess::Running) {
      p.waitForFinished(200);
      QCoreApplication::processEvents();
@@ -362,7 +362,7 @@
   // Check for meta-pkg updates
   /////////////////////////////////////////////
   QProcess m;
-  m.start(QString("pc-metapkgmanager"), QStringList() << "checkup");
+  m.start(QString("sudo"), QStringList() << "pc-updatemanager" << "pkgcheck");
   while(m.state() == QProcess::Starting || m.state() == QProcess::Running) {
      m.waitForFinished(200);
      QCoreApplication::processEvents();
@@ -370,7 +370,7 @@
 
   while (m.canReadLine()) {
     line = m.readLine().simplified();
-    if ( line.indexOf("The following package updates") == 0 ) {
+    if ( line.indexOf("To start the upgrade") == 0 ) {
       haveUp = true;
       break;
     } 

Modified: pcbsd/current/src-sh/pc-extractoverlay/ports-overlay/usr/local/etc/sudoers
===================================================================
--- pcbsd/current/src-sh/pc-extractoverlay/ports-overlay/usr/local/etc/sudoers	2013-03-06 13:25:56 UTC (rev 21700)
+++ pcbsd/current/src-sh/pc-extractoverlay/ports-overlay/usr/local/etc/sudoers	2013-03-06 14:24:47 UTC (rev 21701)
@@ -109,3 +109,4 @@
 %wheel ALL = NOPASSWD: /usr/local/bin/pc-bluetoothtray
 %wheel ALL = NOPASSWD: /usr/local/bin/pc-mounttray
 %wheel ALL = NOPASSWD: /usr/local/bin/pc-soundconfig
+%wheel ALL = NOPASSWD: /usr/local/bin/pc-updatemanager



More information about the Commits mailing list