Diffstat (limited to 'noncore/settings/aqpkg/installdlgimpl.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/settings/aqpkg/installdlgimpl.cpp | 7 |
1 files changed, 5 insertions, 2 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 | |||
@@ -90,7 +90,7 @@ InstallDlgImpl::InstallDlgImpl( vector<InstallData> &packageList, DataManager *d | |||
90 | removeList.push_back( item ); | 90 | removeList.push_back( item ); |
91 | remove += " " + item.packageName + "\n"; | 91 | remove += " " + item.packageName + "\n"; |
92 | } | 92 | } |
93 | else if ( item.option == "U" ) | 93 | else if ( item.option == "U" || item.option == "R" ) |
94 | { | 94 | { |
95 | updateList.push_back( item ); | 95 | updateList.push_back( item ); |
96 | upgrade += " " + item.packageName + "\n"; | 96 | upgrade += " " + item.packageName + "\n"; |
@@ -208,9 +208,12 @@ void InstallDlgImpl :: installSelected() | |||
208 | } | 208 | } |
209 | 209 | ||
210 | flags |= FORCE_REINSTALL; | 210 | flags |= FORCE_REINSTALL; |
211 | pIpkg->setOption( "reinstall" ); | ||
212 | for ( it = updateList.begin() ; it != updateList.end() ; ++it ) | 211 | for ( it = updateList.begin() ; it != updateList.end() ; ++it ) |
213 | { | 212 | { |
213 | if ( it->option == "R" ) | ||
214 | pIpkg->setOption( "reinstall" ); | ||
215 | else | ||
216 | pIpkg->setOption( "upgrade" ); | ||
214 | pIpkg->setDestination( it->destination->getDestinationName() ); | 217 | pIpkg->setDestination( it->destination->getDestinationName() ); |
215 | pIpkg->setDestinationDir( it->destination->getDestinationPath() ); | 218 | pIpkg->setDestinationDir( it->destination->getDestinationPath() ); |
216 | pIpkg->setPackage( it->packageName ); | 219 | pIpkg->setPackage( it->packageName ); |