[PC-BSD Commits] r14062 - pcbsd/current/src-qt4/pc-softwaremanager

[svn at pcbsd.org]

Author: kris
Date: 2011-11-29 09:03:29 -0800 (Tue, 29 Nov 2011)
New Revision: 14062

Modified:
   pcbsd/current/src-qt4/pc-softwaremanager/softmanager-main.cpp
   pcbsd/current/src-qt4/pc-softwaremanager/softmanager-pbibrowser.cpp
Log:

Fix a bug causing a segment fault after installing a PBI which has different white spaces in the name than in the repo details.

Also fix bug viewing details of a PBI with white space in name that differs from repos. 




Modified: pcbsd/current/src-qt4/pc-softwaremanager/softmanager-main.cpp
===================================================================
--- pcbsd/current/src-qt4/pc-softwaremanager/softmanager-main.cpp	2011-11-29 16:09:32 UTC (rev 14061)
+++ pcbsd/current/src-qt4/pc-softwaremanager/softmanager-main.cpp	2011-11-29 17:03:29 UTC (rev 14062)
@@ -354,7 +354,7 @@
   QTreeWidgetItemIterator it(SoftwareListBox);
   while (*it) {
     PBI *item = dynamic_cast<PBI*>(*it);
-    if ( item->getName().toUpper() == name.toUpper() )
+    if ( item->getName().toUpper().remove(" ") == name.toUpper().remove(" ") )
        return item; 
     ++it;
   }

Modified: pcbsd/current/src-qt4/pc-softwaremanager/softmanager-pbibrowser.cpp
===================================================================
--- pcbsd/current/src-qt4/pc-softwaremanager/softmanager-pbibrowser.cpp	2011-11-29 16:09:32 UTC (rev 14061)
+++ pcbsd/current/src-qt4/pc-softwaremanager/softmanager-pbibrowser.cpp	2011-11-29 17:03:29 UTC (rev 14062)
@@ -209,7 +209,7 @@
 
 	int pTot = pbiAvail->count();
 	for( int i = 0; i < pTot; i++)
-		if ( pbiAvail->getName(i).toLower() == pbi.toLower() && pbiAvail->getRepo(i) == pRepo) {
+		if ( pbiAvail->getName(i).toLower().remove(" ") == pbi.toLower().remove(" ") && pbiAvail->getRepo(i) == pRepo) {
 			pbiNum = i;
 			break;
 		}