summaryrefslogtreecommitdiff
path: root/noncore/settings/aqpkg/ipkg.cpp
Side-by-side diff
Diffstat (limited to 'noncore/settings/aqpkg/ipkg.cpp') (more/less context) (show whitespace changes)
-rw-r--r--noncore/settings/aqpkg/ipkg.cpp17
1 files changed, 7 insertions, 10 deletions
diff --git a/noncore/settings/aqpkg/ipkg.cpp b/noncore/settings/aqpkg/ipkg.cpp
index e906653..34999ad 100644
--- a/noncore/settings/aqpkg/ipkg.cpp
+++ b/noncore/settings/aqpkg/ipkg.cpp
@@ -54,12 +54,11 @@ Ipkg :: ~Ipkg()
// dest is the destination alias (from ipk.conf)
// destDir is the dir that the destination alias points to (used to link to root)
// flags is the ipkg options flags
// dir is the directory to run ipkg in (defaults to "")
-bool Ipkg :: runIpkg( )
+void Ipkg :: runIpkg()
{
error = false;
- bool ret = false;
QStringList commands;
QDir::setCurrent( "/tmp" );
@@ -136,13 +135,14 @@ bool Ipkg :: runIpkg( )
// Execute command
dependantPackages = new QList<QString>;
dependantPackages->setAutoDelete( true );
- ret = executeIpkgCommand( commands, option );
+ executeIpkgCommand( commands, option );
- if ( aborted )
- return false;
+}
+void Ipkg :: createSymLinks()
+{
if ( option == "install" || option == "reinstall" || option == "upgrade" )
{
// If we are not removing packages and make links option is selected
// create the links
@@ -170,9 +170,8 @@ bool Ipkg :: runIpkg( )
delete dependantPackages;
emit outputText( "Finished" );
emit outputText( "" );
- return ret;
}
void Ipkg :: removeStatusEntry()
{
@@ -294,12 +293,8 @@ int Ipkg :: executeIpkgCommand( QStringList &cmd, const QString /*option*/ )
if(!proc->start(OProcess::NotifyOnExit, OProcess::All))
{
emit outputText( QString( "Couldn't start ipkg process" ) );
}
-
- // Now wait for it to finish
- while ( !finished )
- qApp->processEvents();
}
void Ipkg::commandStdout(OProcess*, char *buffer, int buflen)
{
@@ -353,8 +348,10 @@ void Ipkg::processFinished()
delete proc;
proc = 0;
finished = true;
+
+ emit ipkgFinished();
}
void Ipkg :: abort()