Diffstat (limited to 'noncore/unsupported/oipkg/pmipkg.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/unsupported/oipkg/pmipkg.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/noncore/unsupported/oipkg/pmipkg.cpp b/noncore/unsupported/oipkg/pmipkg.cpp index 2ed86ee..bffad15 100644 --- a/noncore/unsupported/oipkg/pmipkg.cpp +++ b/noncore/unsupported/oipkg/pmipkg.cpp @@ -70,12 +70,14 @@ bool PmIpkg::runIpkg(const QString& args, const QString& dest ) ipkgProcess->kill(); ipkgProcess->clearArguments(); *ipkgProcess << "/usr/bin/ipkg "; cmd = ""; #endif pvDebug( 3,"PmIpkg::runIpkg got dest="+dest); + if (!args.contains("update")) + { if ( dest == "" ) cmd += " -dest "+settings->getDestinationName(); else cmd += " -dest "+ dest; cmd += " -force-defaults "; @@ -86,14 +88,16 @@ bool PmIpkg::runIpkg(const QString& args, const QString& dest ) cmd += " -force-depends "; if (installDialog->_force_reinstall->isChecked()) cmd += " -force-reinstall "; if (installDialog->_force_remove->isChecked()) cmd += " -force-removal-of-essential-packages "; } + } //!args.contains("update") out( "Starting to "+ args+"\n"); + qApp->processEvents(); cmd += args; out( "running:\n"+cmd+"\n" ); pvDebug(2,"running:"+cmd); #ifdef OPROCESS *ipkgProcess << args; out( "running:\n" + cmd); @@ -430,15 +434,13 @@ void PmIpkg::removeLinks( const QString &dest ) processLinkDir( "/usr", url ); } void PmIpkg::update() { show(); - if ( runIpkg( "update" ) ) - runwindow->close(); - else out("An error occurred!\nPlease check the log."); + runIpkg( "update" ); } void PmIpkg::out( QString o ) { runwindow->outPut->append(o); runwindow->outPut->setCursorPosition(runwindow->outPut->numLines() + 1,0,FALSE); |