[PC-BSD Commits] r20689 - pcbsd/current/src-qt4/pc-installgui

svn at pcbsd.org svn at pcbsd.org
Tue Dec 18 12:34:44 PST 2012


Author: kris
Date: 2012-12-18 20:34:44 +0000 (Tue, 18 Dec 2012)
New Revision: 20689

Modified:
   pcbsd/current/src-qt4/pc-installgui/backend.cpp
   pcbsd/current/src-qt4/pc-installgui/dialogDesktopSelection.cpp
   pcbsd/current/src-qt4/pc-installgui/installer.cpp
Log:

Fix a bug showing all meta-pkgs, and set install type to Dist files



Modified: pcbsd/current/src-qt4/pc-installgui/backend.cpp
===================================================================
--- pcbsd/current/src-qt4/pc-installgui/backend.cpp	2012-12-18 19:37:33 UTC (rev 20688)
+++ pcbsd/current/src-qt4/pc-installgui/backend.cpp	2012-12-18 20:34:44 UTC (rev 20689)
@@ -454,7 +454,7 @@
         if ( tmp.indexOf("Category Entry") == 0) {
 		// Now add this category to the string list
 		package.clear();
-		qDebug() << "Found Package" << mName << mDesc << mIcon << mParent<< mDesktop << "CATEGORY";
+		//qDebug() << "Found Category" << mName << mDesc << mIcon << mParent<< mDesktop << "CATEGORY";
 		package << mName << mDesc << mIcon << mParent << mDesktop << "CATEGORY";
 		metaPkgs.append(package);
 		mName=""; mDesc=""; mIcon=""; mParent=""; mDesktop=""; mPkgFileList="";
@@ -463,7 +463,7 @@
 	if ( tmp.indexOf("Required Packages:") == 0) {
 		// Now add this meta-pkg to the string list
 		package.clear();
-		qDebug() << "Found Package" << mName << mDesc << mIcon << mParent << mDesktop << "NO" << mPkgFileList;
+		//qDebug() << "Found Package" << mName << mDesc << mIcon << mParent << mDesktop << "NO" << mPkgFileList;
 		package << mName << mDesc << mIcon << mParent << mDesktop << "NO" << mPkgFileList;
 		metaPkgs.append(package);
 		found = true;

Modified: pcbsd/current/src-qt4/pc-installgui/dialogDesktopSelection.cpp
===================================================================
--- pcbsd/current/src-qt4/pc-installgui/dialogDesktopSelection.cpp	2012-12-18 19:37:33 UTC (rev 20688)
+++ pcbsd/current/src-qt4/pc-installgui/dialogDesktopSelection.cpp	2012-12-18 20:34:44 UTC (rev 20689)
@@ -52,15 +52,14 @@
 void desktopSelection::addTreeItems(QString parent)
 {
   for (int z=0; z < listDeskPkgs.count(); ++z) {
+
     if ( listDeskPkgs.at(z).at(3) != parent )
       continue;
 
     // Hide the "base-system" package, since we are installing it anyway
     if (listDeskPkgs.at(z).at(0) == "base-system" )
-      return;
+      continue;
 
-    qDebug() << "addTreeItems()" << listDeskPkgs.at(z);
-
     QTreeWidgetItem *deskItem = new QTreeWidgetItem(QStringList() << listDeskPkgs.at(z).at(0) );
     deskItem->setIcon(0, QIcon(listDeskPkgs.at(z).at(2)));
     deskItem->setToolTip(0, listDeskPkgs.at(z).at(1));

Modified: pcbsd/current/src-qt4/pc-installgui/installer.cpp
===================================================================
--- pcbsd/current/src-qt4/pc-installgui/installer.cpp	2012-12-18 19:37:33 UTC (rev 20688)
+++ pcbsd/current/src-qt4/pc-installgui/installer.cpp	2012-12-18 20:34:44 UTC (rev 20689)
@@ -873,11 +873,11 @@
   // If we are doing a PC-BSD install
   if ( wheelCurItem != wPCSERVER && wheelCurItem != 12 && wheelCurItem != wFREEBSD ) {
     tmpList << "installType=PCBSD";
-    tmpList << "packageType=tar";
+    tmpList << "packageType=dist";
     distFiles+=" pcbsd";
   } else {
     tmpList << "installType=FreeBSD";
-    tmpList << "packageType=tar";
+    tmpList << "packageType=dist";
     // If we are doing TrueOS server or FreeBSD server
     if ( wheelCurItem == wPCSERVER || wheelCurItem == 12 )
        distFiles+=" trueos";



More information about the Commits mailing list