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

[svn at pcbsd.org]

Author: kris
Date: 2013-02-07 18:35:16 +0000 (Thu, 07 Feb 2013)
New Revision: 21388

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

Remove some old cruft from metaWidget



Modified: pcbsd/current/src-qt4/libpcbsd/metaWidget.cpp
===================================================================
--- pcbsd/current/src-qt4/libpcbsd/metaWidget.cpp	2013-02-07 18:24:13 UTC (rev 21387)
+++ pcbsd/current/src-qt4/libpcbsd/metaWidget.cpp	2013-02-07 18:35:16 UTC (rev 21388)
@@ -48,7 +48,6 @@
   qDebug() << "Done metaWidget...";
   PkgSet = "pcbsd";
 
-  Version = getLineFromCommandOutput("pbreg get /PC-BSD/Version");
   Arch = getLineFromCommandOutput("uname -m");
 
   populateMetaPkgs();
@@ -244,13 +243,6 @@
 	addPkgs = getAddPkgs();
 	delPkgs = getDelPkgs();
 
-	// If adding pkgs, then we need an installation source
-	if ( ! addPkgs.isEmpty() ) {
-		if ( ! getMediaLocation(pkgSource, rDir) )
-			return;
-	} else 
-		rDir="NONE";
-
 	startMetaChanges();
 
 }
@@ -499,15 +491,6 @@
         }
 }
 
-bool metaWidget::getMediaLocation(QString &source, QString &dir)
-{
-	// Set the mirror URL for fetching pkgs
-	source="MIRROR";
-	dir = Utils::getMasterMirror() + "/" + Version + "/" + Arch + "/netinstall/metapackages/" + PkgSet + "/packages/";
-
-	return true;	
-}
-
 bool metaWidget::haveAMetaDesktop()
 {
 	// If running in a chroot we can skip this check

Modified: pcbsd/current/src-qt4/libpcbsd/pcbsd-utils.h
===================================================================
--- pcbsd/current/src-qt4/libpcbsd/pcbsd-utils.h	2013-02-07 18:24:13 UTC (rev 21387)
+++ pcbsd/current/src-qt4/libpcbsd/pcbsd-utils.h	2013-02-07 18:35:16 UTC (rev 21388)
@@ -206,8 +206,6 @@
    QString addPkgs;
    QString delPkgs;
    QString pkgSource;
-   QString rDir;
-   QString Version;
    QString Arch;
    QString chrootArg1;
    QString chrootArg2;
@@ -229,7 +227,6 @@
    QString getAddPkgs();
    bool haveMetaPkgChanges();
    bool haveAMetaDesktop();
-   bool getMediaLocation(QString &source, QString &dir);
    void saveMetaPkgs();
    void parseTmpMetaList();
    bool isMetaPkgInstalled(QString mPkg);