summaryrefslogtreecommitdiff
Side-by-side diff
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
@@ -161,49 +161,47 @@ void InstallDlgImpl :: installSelected()
Ipkg ipkg;
connect( &ipkg, SIGNAL(outputText(const QString &)), this, SLOT(displayText(const QString &)));
ipkg.setOption( "upgrade" );
ipkg.runIpkg();
}
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 );
#endif
// First run through the remove list, then the install list then the upgrade list
vector<InstallData>::iterator it;
ipkg.setOption( "remove" );
for ( it = removeList.begin() ; it != removeList.end() ; ++it )
{
ipkg.setDestination( it->destination->getDestinationName() );
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" );
ipkg.setDestination( dest );
ipkg.setDestinationDir( destDir );
ipkg.setFlags( instFlags );
for ( it = installList.begin() ; it != installList.end() ; ++it )
{
ipkg.setPackage( it->packageName );
@@ -212,26 +210,24 @@ void InstallDlgImpl :: installSelected()
flags |= FORCE_REINSTALL;
ipkg.setOption( "reinstall" );
for ( it = updateList.begin() ; it != updateList.end() ; ++it )
{
ipkg.setDestination( it->destination->getDestinationName() );
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 );
btnInstall->setText( tr( "Close" ) );
}
void InstallDlgImpl :: displayText(const QString &text )
{
QString t = output->text() + "\n" + text;