-rw-r--r-- | noncore/settings/aqpkg/ipkg.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/noncore/settings/aqpkg/ipkg.cpp b/noncore/settings/aqpkg/ipkg.cpp index d5157eb..f8513e4 100644 --- a/noncore/settings/aqpkg/ipkg.cpp +++ b/noncore/settings/aqpkg/ipkg.cpp @@ -56,25 +56,25 @@ bool Ipkg :: runIpkg( ) QDir::setCurrent( "/tmp" ); QString cmd = ""; if ( runtimeDir != "" ) { cmd += "cd "; cmd += runtimeDir; cmd += " ; "; } cmd += "ipkg"; - if ( option != "update" && option != "download" ) + if ( option != "update" && option != "download" && option != "upgrade" ) { cmd += " -dest "+ destination; cmd += " -force-defaults"; if ( flags & FORCE_DEPENDS ) cmd += " -force-depends"; if ( flags & FORCE_REINSTALL ) cmd += " -force-reinstall"; if ( flags & FORCE_REMOVE ) cmd += " -force-removal-of-essential-packages"; if ( flags & FORCE_OVERWRITE ) cmd += " -force-overwrite"; @@ -88,45 +88,49 @@ bool Ipkg :: runIpkg( ) // to root already. if ( destDir == "/" ) flags ^= MAKE_LINKS; } } #ifdef X86 cmd += " -f "; cmd += IPKG_CONF; #endif - cmd += " " + option + " " + package + " 2>&1"; + cmd += " " + option; + if ( option != "upgrade" ) + cmd += " " + package; + cmd += " 2>&1"; qApp->processEvents(); // If we are removing packages and make links option is selected // create the links if ( option == "remove" ) { createLinks = false; if ( flags & MAKE_LINKS ) { emit outputText( QString( "Removing symbolic links...\n" ) ); linkPackage( Utils::getPackageNameFromIpkFilename( package ), destination, destDir ); } } emit outputText( cmd ); // Execute command dependantPackages = new QList<QString>; dependantPackages->setAutoDelete( true ); + ret = executeIpkgCommand( cmd, option ); if ( option == "install" ) { // If we are not removing packages and make links option is selected // create the links createLinks = true; if ( flags & MAKE_LINKS ) { emit outputText( " " ); emit outputText( QString( "Creating symbolic links for " )+ package ); |