Hopefully handles upgrading to newer packages correctly

4 files changed, 13 insertions, 8 deletions

diff --git a/noncore/settings/aqpkg/installdlgimpl.cpp b/noncore/settings/aqpkg/installdlgimpl.cpp
index f5aef94..83f983a 100644
--- a/noncore/settings/aqpkg/installdlgimpl.cpp
+++ b/noncore/settings/aqpkg/installdlgimpl.cpp
@@ -92,3 +92,3 @@ InstallDlgImpl::InstallDlgImpl( vector<InstallData> &packageList, DataManager *d
                 }
-                else if ( item.option == "U" )
+                else if ( item.option == "U" || item.option == "R" )
                 {
@@ -210,5 +210,8 @@ void InstallDlgImpl :: installSelected()
         flags |= FORCE_REINSTALL;
-        pIpkg->setOption( "reinstall" );
         for ( it = updateList.begin() ; it != updateList.end() ; ++it )
         {
+            if ( it->option == "R" )
+                pIpkg->setOption( "reinstall" );
+            else
+                pIpkg->setOption( "upgrade" );
             pIpkg->setDestination( it->destination->getDestinationName() );
diff --git a/noncore/settings/aqpkg/installdlgimpl.h b/noncore/settings/aqpkg/installdlgimpl.h
index 6716ced..9819b2e 100644
--- a/noncore/settings/aqpkg/installdlgimpl.h
+++ b/noncore/settings/aqpkg/installdlgimpl.h
@@ -30,3 +30,3 @@ class InstallData
 public:
-    QString option;            // I - install, D - delete, U - upgrade
+    QString option;            // I - install, D - delete, R- reinstall U - upgrade
     QString packageName;
diff --git a/noncore/settings/aqpkg/ipkg.cpp b/noncore/settings/aqpkg/ipkg.cpp
index 368548b..731a336 100644
--- a/noncore/settings/aqpkg/ipkg.cpp
+++ b/noncore/settings/aqpkg/ipkg.cpp
@@ -65,8 +65,6 @@ bool Ipkg :: runIpkg( )
     }
-    cmd += "ipkg";
-
-    if ( option != "update" && option != "download" && option != "upgrade" )
+    cmd += "ipkg -force-defaults";
+    if ( option != "update" && option != "download" )
     {
         cmd += " -dest "+ destination;
-        cmd += " -force-defaults";
 
@@ -103,3 +101,3 @@ bool Ipkg :: runIpkg( )
         cmd += " " + option;
-    if ( option != "upgrade" )
+    if ( package != "" )
         cmd += " " + package;
diff --git a/noncore/settings/aqpkg/networkpkgmgr.cpp b/noncore/settings/aqpkg/networkpkgmgr.cpp
index a374266..3971aea 100644
--- a/noncore/settings/aqpkg/networkpkgmgr.cpp
+++ b/noncore/settings/aqpkg/networkpkgmgr.cpp
@@ -561,3 +561,7 @@ InstallData NetworkPackageManager :: dealWithItem( QCheckListItem *item )
         else
+        {
+            if ( item.option == "U" )
+                item.option = "R";
            item.recreateLinks = false;
+        }