summaryrefslogtreecommitdiff
authorandyq <andyq>2002-10-17 23:24:27 (UTC)
committer andyq <andyq>2002-10-17 23:24:27 (UTC)
commit30b26ed0dbbbee829f16ab8ea1e531b89938232d (patch) (side-by-side diff)
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
@@ -167,15 +167,15 @@ void InstallDlgImpl :: installSelected()
else
{
output->setText( "" );
Destination *d = dataMgr->getDestination( destination->currentText() );
QString dest = d->getDestinationName();
QString destDir = d->getDestinationPath();
- int instFlags = 0;
+ int instFlags = flags;
if ( d->linkToRoot() )
- instFlags = MAKE_LINKS;
+ instFlags |= MAKE_LINKS;
#ifdef QWS
// Save settings
Config cfg( "aqpkg" );
cfg.setGroup( "settings" );
cfg.writeEntry( "dest", dest );
@@ -190,14 +190,12 @@ void InstallDlgImpl :: installSelected()
ipkg.setDestinationDir( it->destination->getDestinationPath() );
ipkg.setPackage( it->packageName );
int tmpFlags = flags;
if ( it->destination->linkToRoot() )
tmpFlags |= MAKE_LINKS;
- else
- tmpFlags ^= MAKE_LINKS;
ipkg.setFlags( tmpFlags );
ipkg.runIpkg();
}
ipkg.setOption( "install" );
@@ -218,14 +216,12 @@ void InstallDlgImpl :: installSelected()
ipkg.setDestinationDir( it->destination->getDestinationPath() );
ipkg.setPackage( it->packageName );
int tmpFlags = flags;
if ( it->destination->linkToRoot() && it->recreateLinks )
tmpFlags |= MAKE_LINKS;
- else
- tmpFlags ^= MAKE_LINKS;
ipkg.setFlags( tmpFlags );
ipkg.runIpkg();
}
}
btnInstall->setEnabled( true );