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 | |
parent | 01640bfdce16d2fd23722a59004a6efd4600c0cf (diff) | |
download | opie-995f9ff51e4a687471500765ff40aea27a677197.zip opie-995f9ff51e4a687471500765ff40aea27a677197.tar.gz opie-995f9ff51e4a687471500765ff40aea27a677197.tar.bz2 |
Added abort functionality
-rw-r--r-- | noncore/settings/aqpkg/ipkg.cpp | 22 | ||||
-rw-r--r-- | noncore/settings/aqpkg/ipkg.h | 2 |
2 files changed, 24 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 @@ -40,4 +40,5 @@ using namespace std; Ipkg :: Ipkg() { + proc = 0; } @@ -138,4 +139,7 @@ bool Ipkg :: runIpkg( ) ret = executeIpkgCommand( commands, option ); + if ( aborted ) + return false; + if ( option == "install" || option == "reinstall" ) { @@ -257,6 +261,15 @@ void Ipkg :: removeStatusEntry() 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 @@ -318,8 +331,17 @@ void Ipkg::processFinished() { delete proc; + proc = 0; finished = true; } +void Ipkg :: abort() +{ + if ( proc ) + { + proc->kill(); + aborted = true; + } +} /* diff --git a/noncore/settings/aqpkg/ipkg.h b/noncore/settings/aqpkg/ipkg.h index 25bae59..f08667b 100644 --- a/noncore/settings/aqpkg/ipkg.h +++ b/noncore/settings/aqpkg/ipkg.h @@ -60,8 +60,10 @@ public slots: void commandStderr(OProcess*, char *buffer, int buflen); void processFinished(); + void abort(); private: bool createLinks; + bool aborted; QString option; QString package; |