[PC-BSD Commits] r20797 - users/ken/EasyPBI2

[svn at pcbsd.org]

Author: kenmoore
Date: 2012-12-28 18:47:52 +0000 (Fri, 28 Dec 2012)
New Revision: 20797

Modified:
   users/ken/EasyPBI2/portsDialog.cpp
   users/ken/EasyPBI2/portsDialog.ui
Log:
Fix up another bug with updating the EasyPBI ports tree, also fix the issue with the window resizing from long extraction messages.



Modified: users/ken/EasyPBI2/portsDialog.cpp
===================================================================
--- users/ken/EasyPBI2/portsDialog.cpp	2012-12-28 18:20:29 UTC (rev 20796)
+++ users/ken/EasyPBI2/portsDialog.cpp	2012-12-28 18:47:52 UTC (rev 20797)
@@ -170,7 +170,6 @@
   file.close();
   //Saving the file successful, delete the downloaded data from memory
   reply->deleteLater();
-  ui->label_status->setText(tr("Extracting the ports tree into the EasyPBI directory. (This may take a while)"));
   QTimer::singleShot(1000, this, SLOT(extractLocalPorts()) ); //wait 1 sec to start process
 }
 
@@ -182,10 +181,12 @@
   if(pDir.endsWith("/")){ pDir.chop(1); } //remove any extra "/" on the end
   if(localPorts){ //remove the old tree if it exists
     qDebug() << "Removing current local ports tree";
-    QString rcmd = "cd "+pDir+"; rm -r ports/";
+    ui->label_status->setText(tr("Removing the old ports tree from the EasyPBI directory."));
+    QString rcmd = "cd "+pDir+"/ports; rm -rf `ls | grep -v distfiles`";
     system(rcmd.toUtf8()); 
   } 
   //extract the new tree and remove the downloaded file
+  ui->label_status->setText(tr("Extracting the ports tree into the EasyPBI directory. (This may take a while)"));
   QString cmd1 = "tar xvf "+pFile;
   p->setWorkingDirectory(pDir); //Make sure we start in the proper directory
   p->start(cmd1);

Modified: users/ken/EasyPBI2/portsDialog.ui
===================================================================
(Binary files differ)