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

[svn at pcbsd.org]

Author: kris
Date: 2012-06-18 13:51:21 +0000 (Mon, 18 Jun 2012)
New Revision: 17298

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

Fix a bug adding desktop packages to installer



Modified: pcbsd/current/src-qt4/pc-installgui/installer.cpp
===================================================================
--- pcbsd/current/src-qt4/pc-installgui/installer.cpp	2012-06-18 13:07:20 UTC (rev 17297)
+++ pcbsd/current/src-qt4/pc-installgui/installer.cpp	2012-06-18 13:51:21 UTC (rev 17298)
@@ -69,8 +69,8 @@
     connect(comboLanguage, SIGNAL(currentIndexChanged(QString)), this, SLOT(slotChangeLanguage()));
 
     // Load any package scheme data
-    listDeskPkgs = Scripts::Backend::getPackageData(availPackageData, QString());
-    listServerPkgs = Scripts::Backend::getPackageData(availPackageData, QString("warden"));
+    listDeskPkgs = Scripts::Backend::getPackageData(availDesktopPackageData, QString());
+    listServerPkgs = Scripts::Backend::getPackageData(availServerPackageData, QString("warden"));
 
     // Do check for available meta-pkgs on boot media
     if ( QFile::exists("/tmp/no-meta-pkgs") )
@@ -78,6 +78,8 @@
     else
     	hasPkgsOnMedia = true;
 
+    qDebug() << "Package Media:" << availDesktopPackageData << hasPkgsOnMedia;
+
     // See if this media has a freebsd release on it
     if ( QFile::exists("/tmp/no-fbsd-release") ) {
 	hasFreeBSDOnMedia = false;
@@ -952,7 +954,7 @@
     //cfgList << "runCommand=/usr/local/share/pcbsd/scripts/set-lang.sh " + lang + " " + layout;
  
     // If doing install from package disk
-    if ( availPackageData && hasPkgsOnMedia )
+    if ( hasPkgsOnMedia )
       cfgList+=getDeskPkgCfg();
 
     // Set all firewall rules
@@ -977,7 +979,7 @@
       cfgList << "runCommand=echo 'sshd_enable=\"YES\"' >>/etc/rc.conf";
 
     // If doing install from package disk
-    if ( availPackageData && hasPkgsOnMedia )
+    if ( hasPkgsOnMedia )
       cfgList+=getDeskPkgCfg();
 
     // Unmount our /dev
@@ -1356,7 +1358,7 @@
              range = range + 50;
              progressBarInstall->setRange(0, range + 1);  
              installFoundCounter = true;
-	     if ( availPackageData )
+	     if ( availDesktopPackageData )
                 labelInstallStatus->setText(tr("Extracting system image...")); 
 	     else
                 labelInstallStatus->setText(tr("Installing system... This may take a while...")); 

Modified: pcbsd/current/src-qt4/pc-installgui/installer.h
===================================================================
--- pcbsd/current/src-qt4/pc-installgui/installer.h	2012-06-18 13:07:20 UTC (rev 17297)
+++ pcbsd/current/src-qt4/pc-installgui/installer.h	2012-06-18 13:51:21 UTC (rev 17298)
@@ -92,7 +92,8 @@
     QStringList wheelName;
     QStringList wheelDesc;
     int wheelCurItem;
-    bool availPackageData;
+    bool availDesktopPackageData;
+    bool availServerPackageData;
     QList<QStringList> listDeskPkgs; // QStringList for our available desktop pkgs
     QList<QStringList> listServerPkgs; // QStringList for our available server pkgs
     QStringList selectedPkgs; // QStringList for selected packages