[PC-BSD Commits] r16154 - pcbsd/current/src-qt4/libpcbsd

[svn at pcbsd.org]

Author: kris
Date: 2012-04-02 19:37:13 +0000 (Mon, 02 Apr 2012)
New Revision: 16154

Modified:
   pcbsd/current/src-qt4/libpcbsd/dialogMetaProgress.h
   pcbsd/current/src-qt4/libpcbsd/metaWidget.cpp
   pcbsd/current/src-qt4/libpcbsd/pcbsd-utils.h
Log:

Update location of where we fetch metapkg files from 



Modified: pcbsd/current/src-qt4/libpcbsd/dialogMetaProgress.h
===================================================================
--- pcbsd/current/src-qt4/libpcbsd/dialogMetaProgress.h	2012-04-02 18:31:17 UTC (rev 16153)
+++ pcbsd/current/src-qt4/libpcbsd/dialogMetaProgress.h	2012-04-02 19:37:13 UTC (rev 16154)
@@ -32,6 +32,7 @@
 private slots:
 
 private:
+    QString PkgSet;
 
 signals:
 

Modified: pcbsd/current/src-qt4/libpcbsd/metaWidget.cpp
===================================================================
--- pcbsd/current/src-qt4/libpcbsd/metaWidget.cpp	2012-04-02 18:31:17 UTC (rev 16153)
+++ pcbsd/current/src-qt4/libpcbsd/metaWidget.cpp	2012-04-02 19:37:13 UTC (rev 16154)
@@ -46,6 +46,7 @@
   hLayout->insertSpacerItem(-1, dSpace);
   verticalLayout->insertLayout(-1, hLayout);
   qDebug() << "Done metaWidget...";
+  PkgSet = "pcbsd";
 
   QSettings settings("PCBSD");
   Version = settings.value("/PC-BSD/Version", Version).toString();
@@ -406,7 +407,7 @@
 {
 	// Set the mirror URL for fetching pkgs
 	source="MIRROR";
-	dir = Utils::getMasterMirror() + "/" + Version + "/" + Arch + "/netinstall/packages/";
+	dir = Utils::getMasterMirror() + "/" + Version + "/" + Arch + "/netinstall/metapackages/" + PkgSet + "/";
 
 	return true;	
 }
@@ -708,3 +709,8 @@
    stopped=true;
    setHidden(true);
 }
+
+void metaWidget::setPackageSet(QString set)
+{
+   PkgSet=set;
+}

Modified: pcbsd/current/src-qt4/libpcbsd/pcbsd-utils.h
===================================================================
--- pcbsd/current/src-qt4/libpcbsd/pcbsd-utils.h	2012-04-02 18:31:17 UTC (rev 16153)
+++ pcbsd/current/src-qt4/libpcbsd/pcbsd-utils.h	2012-04-02 19:37:13 UTC (rev 16154)
@@ -116,6 +116,7 @@
         }
 
      void init(QString chroot);
+     void setPackageSet(QString set);
      void stop();
 
 public slots:
@@ -153,6 +154,7 @@
    QString chrootArg1;
    QString chrootArg2;
    bool stopped;
+   QString PkgSet;
 
    QMenu *popup;
    metaProgressDialog *metaProgressDel;