author | andyq <andyq> | 2002-12-17 22:31:10 (UTC) |
---|---|---|
committer | andyq <andyq> | 2002-12-17 22:31:10 (UTC) |
commit | 995f9ff51e4a687471500765ff40aea27a677197 (patch) (side-by-side diff) | |
tree | 376f3f7351a0192d42f0c2e351f39b1e1e0a38f7 /noncore/settings/aqpkg/ipkg.cpp | |
parent | 01640bfdce16d2fd23722a59004a6efd4600c0cf (diff) | |
download | opie-995f9ff51e4a687471500765ff40aea27a677197.zip opie-995f9ff51e4a687471500765ff40aea27a677197.tar.gz opie-995f9ff51e4a687471500765ff40aea27a677197.tar.bz2 |
Added abort functionality
Diffstat (limited to 'noncore/settings/aqpkg/ipkg.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/settings/aqpkg/ipkg.cpp | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/noncore/settings/aqpkg/ipkg.cpp b/noncore/settings/aqpkg/ipkg.cpp index 407abe9..7afe04f 100644 --- a/noncore/settings/aqpkg/ipkg.cpp +++ b/noncore/settings/aqpkg/ipkg.cpp @@ -36,12 +36,13 @@ using namespace std; #include "utils.h" #include "ipkg.h" #include "global.h" Ipkg :: Ipkg() { + proc = 0; } Ipkg :: ~Ipkg() { } @@ -134,12 +135,15 @@ bool Ipkg :: runIpkg( ) // Execute command dependantPackages = new QList<QString>; dependantPackages->setAutoDelete( true ); ret = executeIpkgCommand( commands, option ); + if ( aborted ) + return false; + if ( option == "install" || option == "reinstall" ) { // If we are not removing packages and make links option is selected // create the links createLinks = true; if ( flags & MAKE_LINKS ) @@ -253,14 +257,23 @@ void Ipkg :: removeStatusEntry() remove( statusFile ); rename( outStatusFile, statusFile ); } int Ipkg :: executeIpkgCommand( QStringList &cmd, const QString option ) { + // If one is already running - should never be but just to be safe + if ( proc ) + { + delete proc; + proc = 0; + } + // OK we're gonna use OProcess to run this thing proc = new OProcess(); + aborted = false; + // Connect up our slots connect(proc, SIGNAL(processExited(OProcess *)), this, SLOT( processFinished())); connect(proc, SIGNAL(receivedStdout(OProcess *, char *, int)), @@ -314,16 +327,25 @@ void Ipkg::commandStderr(OProcess*, char *buffer, int buflen) buffer[0] = '\0'; } void Ipkg::processFinished() { delete proc; + proc = 0; finished = true; } +void Ipkg :: abort() +{ + if ( proc ) + { + proc->kill(); + aborted = true; + } +} /* int Ipkg :: executeIpkgCommand( QString &cmd, const QString option ) { FILE *fp = NULL; char line[130]; |