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

svn at pcbsd.org svn at pcbsd.org
Sat Feb 9 12:48:56 PST 2013


Author: kris
Date: 2013-02-09 20:48:56 +0000 (Sat, 09 Feb 2013)
New Revision: 21444

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

Fix to creating installPackages= list



Modified: pcbsd/current/src-qt4/pc-installgui/backend.cpp
===================================================================
--- pcbsd/current/src-qt4/pc-installgui/backend.cpp	2013-02-09 17:02:26 UTC (rev 21443)
+++ pcbsd/current/src-qt4/pc-installgui/backend.cpp	2013-02-09 20:48:56 UTC (rev 21444)
@@ -442,7 +442,7 @@
 	if ( tmp.indexOf("Icon: ") == 0) {
 		mIcon = tmp.replace("Icon: ", "");
 	        mPkgFileList = mIcon;
-                mPkgFileList.replace("pkg-icon.png", "pkg-list");
+                mPkgFileList.replace("pkg-icon.png", "ports-list");
 		continue;
 	}
 	if ( tmp.indexOf("Parent: ") == 0) {

Modified: pcbsd/current/src-qt4/pc-installgui/installer.cpp
===================================================================
--- pcbsd/current/src-qt4/pc-installgui/installer.cpp	2013-02-09 17:02:26 UTC (rev 21443)
+++ pcbsd/current/src-qt4/pc-installgui/installer.cpp	2013-02-09 20:48:56 UTC (rev 21444)
@@ -1562,10 +1562,11 @@
            // Read in the meta pkg list
            QTextStream in(&mFile);
            while ( !in.atEnd() ) {
-             line = in.readLine();
+             line = in.readLine().simplified();
 	     if ( line.isEmpty() )
                  continue; 
-             pkgList << line.simplified();
+	     
+             pkgList << line.section(":", 0,0);
            }
            mFile.close();
 	   break;



More information about the Commits mailing list