summaryrefslogtreecommitdiff
authordrw <drw>2003-02-25 00:39:29 (UTC)
committer drw <drw>2003-02-25 00:39:29 (UTC)
commit8d80ed4f9cf8051b5566aaf3f639c76fe7d6de7c (patch) (side-by-side diff)
tree95ac0e3df097d1d2af81dbb543502b0682043fc0
parent45fc2c7089de9bbb7887ba9bdb56c974b19c1caf (diff)
downloadopie-8d80ed4f9cf8051b5566aaf3f639c76fe7d6de7c.zip
opie-8d80ed4f9cf8051b5566aaf3f639c76fe7d6de7c.tar.gz
opie-8d80ed4f9cf8051b5566aaf3f639c76fe7d6de7c.tar.bz2
Fix for bug #707 - remove package from status file only if package removal was successful.
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
@@ -56,8 +56,9 @@ Ipkg :: ~Ipkg()
// flags is the ipkg options flags
// dir is the directory to run ipkg in (defaults to "")
bool Ipkg :: runIpkg( )
{
+ error = false;
bool ret = false;
QStringList commands;
QDir::setCurrent( "/tmp" );
@@ -167,14 +168,8 @@ bool Ipkg :: runIpkg( )
}
delete dependantPackages;
- // Finally, if we are removing a package, remove its entry from the <destdir>/usr/lib/ipkg/status file
- // to workaround an ipkg bug which stops reinstall to a different location
- if ( option == "remove" )
- removeStatusEntry();
-
-
emit outputText( "Finished" );
emit outputText( "" );
return ret;
@@ -339,12 +334,18 @@ void Ipkg::commandStderr(OProcess*, char *buffer, int buflen)
buflen --;
lineStr=lineStr.left( buflen );
emit outputText( lineStr );
buffer[0] = '\0';
+ error = true;
}
void Ipkg::processFinished()
{
+ // Finally, if we are removing a package, remove its entry from the <destdir>/usr/lib/ipkg/status file
+ // to workaround an ipkg bug which stops reinstall to a different location
+ if ( !error && option == "remove" )
+ removeStatusEntry();
+
delete proc;
proc = 0;
finished = true;
}
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
@@ -64,8 +64,9 @@ public slots:
private:
bool createLinks;
bool aborted;
+ bool error;
QString option;
QString package;
QString destination;
QString destDir;