summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/aqpkg/ipkg.cpp13
-rw-r--r--noncore/settings/aqpkg/ipkg.h1
2 files changed, 8 insertions, 6 deletions
diff --git a/noncore/settings/aqpkg/ipkg.cpp b/noncore/settings/aqpkg/ipkg.cpp
index 51eca8b..e66c02d 100644
--- a/noncore/settings/aqpkg/ipkg.cpp
+++ b/noncore/settings/aqpkg/ipkg.cpp
@@ -59,2 +59,3 @@ bool Ipkg :: runIpkg( )
59{ 59{
60 error = false;
60 bool ret = false; 61 bool ret = false;
@@ -170,8 +171,2 @@ bool Ipkg :: runIpkg( )
170 171
171 // Finally, if we are removing a package, remove its entry from the <destdir>/usr/lib/ipkg/status file
172 // to workaround an ipkg bug which stops reinstall to a different location
173 if ( option == "remove" )
174 removeStatusEntry();
175
176
177 emit outputText( "Finished" ); 172 emit outputText( "Finished" );
@@ -342,2 +337,3 @@ void Ipkg::commandStderr(OProcess*, char *buffer, int buflen)
342 buffer[0] = '\0'; 337 buffer[0] = '\0';
338 error = true;
343} 339}
@@ -346,2 +342,7 @@ void Ipkg::processFinished()
346{ 342{
343 // Finally, if we are removing a package, remove its entry from the <destdir>/usr/lib/ipkg/status file
344 // to workaround an ipkg bug which stops reinstall to a different location
345 if ( !error && option == "remove" )
346 removeStatusEntry();
347
347 delete proc; 348 delete proc;
diff --git a/noncore/settings/aqpkg/ipkg.h b/noncore/settings/aqpkg/ipkg.h
index f08667b..d49bb04 100644
--- a/noncore/settings/aqpkg/ipkg.h
+++ b/noncore/settings/aqpkg/ipkg.h
@@ -67,2 +67,3 @@ private:
67 bool aborted; 67 bool aborted;
68 bool error;
68 QString option; 69 QString option;