[PC-BSD Commits] r7884 - in pcbsd/current: src-qt4/pc-sysinstaller src-sh/pc-metapkgmanager

[svn at pcbsd.org]

Author: kris
Date: 2010-10-22 11:45:00 -0700 (Fri, 22 Oct 2010)
New Revision: 7884

Modified:
   pcbsd/current/src-qt4/pc-sysinstaller/sys-installwidget.cpp
   pcbsd/current/src-sh/pc-metapkgmanager/pc-metapkgmanager
Log:

Added some better triggers to display progress about meta-pkg installation



Modified: pcbsd/current/src-qt4/pc-sysinstaller/sys-installwidget.cpp
===================================================================
--- pcbsd/current/src-qt4/pc-sysinstaller/sys-installwidget.cpp	2010-10-22 18:35:00 UTC (rev 7883)
+++ pcbsd/current/src-qt4/pc-sysinstaller/sys-installwidget.cpp	2010-10-22 18:45:00 UTC (rev 7884)
@@ -168,7 +168,7 @@
                 labelInstallStatus->setText(tr("Installing system... This may take a while...")); 
           }
 
-        } else if ( tmp.indexOf("Pending Meta-Package changes: ") != -1 ) {
+        } else if ( tmp.indexOf("Pending package changes: ") != -1 ) {
           tmp = tmp.remove(0, tmp.indexOf(":") + 1 ); 
           range = tmp.toInt(&ok);
           if ( ok ) {
@@ -192,7 +192,7 @@
          installFoundCounter = false;
          progressBarInstall->setRange(0, 0);  
        }
-       if ( tmp.indexOf("Meta-Package changes finished!") != -1 ) {
+       if ( tmp.indexOf("Finished installing:") != -1 ) {
          installFoundMetaCounter = false;
          progressBarInstall->setRange(0, 0);  
        }

Modified: pcbsd/current/src-sh/pc-metapkgmanager/pc-metapkgmanager
===================================================================
--- pcbsd/current/src-sh/pc-metapkgmanager/pc-metapkgmanager	2010-10-22 18:35:00 UTC (rev 7883)
+++ pcbsd/current/src-sh/pc-metapkgmanager/pc-metapkgmanager	2010-10-22 18:45:00 UTC (rev 7884)
@@ -79,6 +79,8 @@
 
 	# Apply our PC-BSD specific xdg menu entry files
 	/usr/local/bin/pc-xdgutil updatemenu
+
+	echo "Finished installing: $_apkg"
 	
 }