summaryrefslogtreecommitdiff
authorandyq <andyq>2002-10-17 23:24:27 (UTC)
committer andyq <andyq>2002-10-17 23:24:27 (UTC)
commit30b26ed0dbbbee829f16ab8ea1e531b89938232d (patch) (unidiff)
tree89f2639cfc97e74fa15c50cd360acba25e9a2cab
parentcd48ed3935f1baa6392afee5764d0927abcf62cc (diff)
downloadopie-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
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/aqpkg/installdlgimpl.cpp8
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
@@ -170,9 +170,9 @@ void InstallDlgImpl :: installSelected()
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
@@ -193,8 +193,6 @@ void InstallDlgImpl :: installSelected()
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();
@@ -221,8 +219,6 @@ void InstallDlgImpl :: installSelected()
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 }