Diffstat (limited to 'noncore/settings/aqpkg/networkpkgmgr.cpp') (more/less context) (ignore whitespace changes)
| -rw-r--r-- | noncore/settings/aqpkg/networkpkgmgr.cpp | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/noncore/settings/aqpkg/networkpkgmgr.cpp b/noncore/settings/aqpkg/networkpkgmgr.cpp index 3d06aef..dee834e 100644 --- a/noncore/settings/aqpkg/networkpkgmgr.cpp +++ b/noncore/settings/aqpkg/networkpkgmgr.cpp @@ -516,5 +516,6 @@ InstallData NetworkPackageManager :: dealWithItem( QCheckListItem *item ) - // If the package has a filename then it is a local file - if ( p->isPackageStoredLocally() ) - name = p->getFilename(); + // If the package has a filename then it is a local file + if ( p->isPackageStoredLocally() ) + name = p->getFilename(); + QString option; @@ -526,3 +527,3 @@ InstallData NetworkPackageManager :: dealWithItem( QCheckListItem *item ) item.packageName = name; - return item; + return item; } @@ -532,3 +533,7 @@ InstallData NetworkPackageManager :: dealWithItem( QCheckListItem *item ) item.option = "D"; - item.packageName = p->getInstalledPackageName(); + if ( !p->isPackageStoredLocally() ) + item.packageName = p->getInstalledPackageName(); + else + item.packageName = name; + if ( p->getInstalledTo() ) @@ -546,2 +551,7 @@ InstallData NetworkPackageManager :: dealWithItem( QCheckListItem *item ) int val = compareVersions( p->getInstalledVersion(), p->getVersion() ); + + // If the version requested is older and user selected a local ipk file, then reinstall the file + if ( p->isPackageStoredLocally() && val == -1 ) + val = 0; + if ( val == -2 ) |