author | andyq <andyq> | 2002-10-17 23:24:27 (UTC) |
---|---|---|
committer | andyq <andyq> | 2002-10-17 23:24:27 (UTC) |
commit | 30b26ed0dbbbee829f16ab8ea1e531b89938232d (patch) (unidiff) | |
tree | 89f2639cfc97e74fa15c50cd360acba25e9a2cab | |
parent | cd48ed3935f1baa6392afee5764d0927abcf62cc (diff) | |
download | opie-30b26ed0dbbbee829f16ab8ea1e531b89938232d.zip opie-30b26ed0dbbbee829f16ab8ea1e531b89938232d.tar.gz opie-30b26ed0dbbbee829f16ab8ea1e531b89938232d.tar.bz2 |
Fixed bug which caused links to be recreated even if same version of package was reinstalled
-rw-r--r-- | noncore/settings/aqpkg/installdlgimpl.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/noncore/settings/aqpkg/installdlgimpl.cpp b/noncore/settings/aqpkg/installdlgimpl.cpp index bbb0be75..e122064 100644 --- a/noncore/settings/aqpkg/installdlgimpl.cpp +++ b/noncore/settings/aqpkg/installdlgimpl.cpp | |||
@@ -165,19 +165,19 @@ void InstallDlgImpl :: installSelected() | |||
165 | ipkg.runIpkg(); | 165 | ipkg.runIpkg(); |
166 | } | 166 | } |
167 | else | 167 | else |
168 | { | 168 | { |
169 | output->setText( "" ); | 169 | output->setText( "" ); |
170 | Destination *d = dataMgr->getDestination( destination->currentText() ); | 170 | Destination *d = dataMgr->getDestination( destination->currentText() ); |
171 | QString dest = d->getDestinationName(); | 171 | QString dest = d->getDestinationName(); |
172 | QString destDir = d->getDestinationPath(); | 172 | QString destDir = d->getDestinationPath(); |
173 | int instFlags = 0; | 173 | int instFlags = flags; |
174 | if ( d->linkToRoot() ) | 174 | if ( d->linkToRoot() ) |
175 | instFlags = MAKE_LINKS; | 175 | instFlags |= MAKE_LINKS; |
176 | 176 | ||
177 | #ifdef QWS | 177 | #ifdef QWS |
178 | // Save settings | 178 | // Save settings |
179 | Config cfg( "aqpkg" ); | 179 | Config cfg( "aqpkg" ); |
180 | cfg.setGroup( "settings" ); | 180 | cfg.setGroup( "settings" ); |
181 | cfg.writeEntry( "dest", dest ); | 181 | cfg.writeEntry( "dest", dest ); |
182 | #endif | 182 | #endif |
183 | 183 | ||
@@ -188,18 +188,16 @@ void InstallDlgImpl :: installSelected() | |||
188 | { | 188 | { |
189 | ipkg.setDestination( it->destination->getDestinationName() ); | 189 | ipkg.setDestination( it->destination->getDestinationName() ); |
190 | ipkg.setDestinationDir( it->destination->getDestinationPath() ); | 190 | ipkg.setDestinationDir( it->destination->getDestinationPath() ); |
191 | ipkg.setPackage( it->packageName ); | 191 | ipkg.setPackage( it->packageName ); |
192 | 192 | ||
193 | int tmpFlags = flags; | 193 | int tmpFlags = flags; |
194 | if ( it->destination->linkToRoot() ) | 194 | if ( it->destination->linkToRoot() ) |
195 | tmpFlags |= MAKE_LINKS; | 195 | tmpFlags |= MAKE_LINKS; |
196 | else | ||
197 | tmpFlags ^= MAKE_LINKS; | ||
198 | 196 | ||
199 | ipkg.setFlags( tmpFlags ); | 197 | ipkg.setFlags( tmpFlags ); |
200 | ipkg.runIpkg(); | 198 | ipkg.runIpkg(); |
201 | } | 199 | } |
202 | 200 | ||
203 | ipkg.setOption( "install" ); | 201 | ipkg.setOption( "install" ); |
204 | ipkg.setDestination( dest ); | 202 | ipkg.setDestination( dest ); |
205 | ipkg.setDestinationDir( destDir ); | 203 | ipkg.setDestinationDir( destDir ); |
@@ -216,18 +214,16 @@ void InstallDlgImpl :: installSelected() | |||
216 | { | 214 | { |
217 | ipkg.setDestination( it->destination->getDestinationName() ); | 215 | ipkg.setDestination( it->destination->getDestinationName() ); |
218 | ipkg.setDestinationDir( it->destination->getDestinationPath() ); | 216 | ipkg.setDestinationDir( it->destination->getDestinationPath() ); |
219 | ipkg.setPackage( it->packageName ); | 217 | ipkg.setPackage( it->packageName ); |
220 | 218 | ||
221 | int tmpFlags = flags; | 219 | int tmpFlags = flags; |
222 | if ( it->destination->linkToRoot() && it->recreateLinks ) | 220 | if ( it->destination->linkToRoot() && it->recreateLinks ) |
223 | tmpFlags |= MAKE_LINKS; | 221 | tmpFlags |= MAKE_LINKS; |
224 | else | ||
225 | tmpFlags ^= MAKE_LINKS; | ||
226 | ipkg.setFlags( tmpFlags ); | 222 | ipkg.setFlags( tmpFlags ); |
227 | ipkg.runIpkg(); | 223 | ipkg.runIpkg(); |
228 | } | 224 | } |
229 | } | 225 | } |
230 | 226 | ||
231 | btnInstall->setEnabled( true ); | 227 | btnInstall->setEnabled( true ); |
232 | btnInstall->setText( tr( "Close" ) ); | 228 | btnInstall->setText( tr( "Close" ) ); |
233 | } | 229 | } |