Fixed relinking of files when upgrade selected (now removes old links first and recreates them after), also cut down on spurious failed to link errors on linking

1 files changed, 8 insertions, 5 deletions

diff --git a/noncore/settings/aqpkg/ipkg.cpp b/noncore/settings/aqpkg/ipkg.cpp
index 29bf40d..51eca8b 100644
--- a/noncore/settings/aqpkg/ipkg.cpp
+++ b/noncore/settings/aqpkg/ipkg.cpp
@@ -118,11 +118,11 @@ bool Ipkg :: runIpkg( )
         emit outputText( QString( "Dealing with package " ) + package );
 
     qApp->processEvents();
 
-    // If we are removing packages and make links option is selected
+    // If we are removing, reinstalling or upgrading packages and make links option is selected
     // create the links
-    if ( option == "remove" || option == "reinstall" )
+    if ( option == "remove" || option == "reinstall" || option == "upgrade" )
     {
         createLinks = false;
         if ( flags & MAKE_LINKS )
         {
@@ -140,9 +140,9 @@ bool Ipkg :: runIpkg( )
 
     if ( aborted )
         return false;
 
-    if ( option == "install" || option == "reinstall" )
+    if ( option == "install" || option == "reinstall" || option == "upgrade" )
     {
         // If we are not removing packages and make links option is selected
         // create the links
         createLinks = true;
@@ -521,10 +521,10 @@ void Ipkg :: processLinkDir( const QString &file, const QString &destDir, const
                 emit outputText( QString( "Creating directory " ) + linkFile );
                 QDir d;
                 d.mkdir( linkFile, true );
             }
-            else
-                emit outputText( QString( "Directory " ) + linkFile + " already exists" );
+//            else
+//                emit outputText( QString( "Directory " ) + linkFile + " already exists" );
             
         }
         else
         {
@@ -551,12 +551,15 @@ void Ipkg :: processLinkDir( const QString &file, const QString &destDir, const
             else if ( f.isDir() )
             {
                 QDir d;
                 bool rc = d.rmdir( linkFile, true );
+                if ( rc )
+                {
                 text = (rc ? "Removed " : "Failed to remove ");
                 text += linkFile;
                 emit outputText( text );
             }
         }
     }
+    }
     
 }