[PC-BSD Commits] r21681 - pcbsd/current/src-qt4/warden-gui

svn at pcbsd.org svn at pcbsd.org
Fri Mar 1 09:36:59 PST 2013


Author: kris
Date: 2013-03-01 17:36:59 +0000 (Fri, 01 Mar 2013)
New Revision: 21681

Modified:
   pcbsd/current/src-qt4/warden-gui/dialogwarden.cpp
Log:

Fix a bug setting right meta-pkg set for warden packages



Modified: pcbsd/current/src-qt4/warden-gui/dialogwarden.cpp
===================================================================
--- pcbsd/current/src-qt4/warden-gui/dialogwarden.cpp	2013-03-01 17:32:18 UTC (rev 21680)
+++ pcbsd/current/src-qt4/warden-gui/dialogwarden.cpp	2013-03-01 17:36:59 UTC (rev 21681)
@@ -1102,21 +1102,10 @@
    QString tmp;
 
    // Load the meta-pkg set
-   QString dMeta = Utils::getValFromPCConf(JailDir + listJails->currentItem()->text(0) + "/usr/local/etc/warden.conf", "PCBSD_METAPKGSET");
-
+   QString dMeta = "trueos";
    comboPackageSet->clear();
-   QDir dir("/var/db/pc-metapkgmanager/pkgsets");
-   dir.setFilter(QDir::Dirs);
-   dir.setSorting(QDir::Name);
-   dir.setNameFilters(QStringList() << "ward*" );
+   comboPackageSet->addItem(dMeta);
 
-   QStringList list = dir.entryList();
-   for (int i = 0; i < list.size(); ++i) {
-       comboPackageSet->addItem(list.at(i));
-       if (list.at(i) == dMeta)
-          comboPackageSet->setCurrentIndex(i);
-   }
-
    // Load the details for this jail
    for (int i=0; i < jailDetails.count(); ++i) {
      if ( jailDetails.at(i).at(0) != listJails->currentItem()->text(0) )



More information about the Commits mailing list