summaryrefslogtreecommitdiff
authorandyq <andyq>2002-11-01 00:01:58 (UTC)
committer andyq <andyq>2002-11-01 00:01:58 (UTC)
commit108c1c753e74e989cc13923086996791428c9af4 (patch) (side-by-side diff)
treed814e79cf60dd39c973e9bd98b1954126f5c1039
parentaad44cbe72cda54a92e5f777fb3f4ea7d01cc429 (diff)
downloadopie-108c1c753e74e989cc13923086996791428c9af4.zip
opie-108c1c753e74e989cc13923086996791428c9af4.tar.gz
opie-108c1c753e74e989cc13923086996791428c9af4.tar.bz2
Added workaround for installing, removing then reinstalling packages to
different destiations. Also now only sends the -dest command down to ipkg on an install
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/aqpkg/ipkg.cpp82
-rw-r--r--noncore/settings/aqpkg/ipkg.h1
2 files changed, 81 insertions, 2 deletions
diff --git a/noncore/settings/aqpkg/ipkg.cpp b/noncore/settings/aqpkg/ipkg.cpp
index c762633..452eca3 100644
--- a/noncore/settings/aqpkg/ipkg.cpp
+++ b/noncore/settings/aqpkg/ipkg.cpp
@@ -59,20 +59,24 @@ bool Ipkg :: runIpkg( )
if ( runtimeDir != "" )
{
cmd += "cd ";
cmd += runtimeDir;
cmd += " ; ";
}
cmd += "ipkg -force-defaults";
- if ( option != "update" && option != "download" )
- {
+
+ // only set the destination for an install operation
+ if ( option == "install" )
cmd += " -dest "+ destination;
+
+ if ( option != "update" && option != "download" )
+ {
if ( flags & FORCE_DEPENDS )
cmd += " -force-depends";
if ( flags & FORCE_REINSTALL )
cmd += " -force-reinstall";
if ( flags & FORCE_REMOVE )
cmd += " -force-removal-of-essential-packages";
if ( flags & FORCE_OVERWRITE )
cmd += " -force-overwrite";
@@ -151,23 +155,97 @@ bool Ipkg :: runIpkg( )
emit outputText( " " );
emit outputText( QString( "Creating symbolic links for " )+ (*pkg) );
linkPackage( Utils::getPackageNameFromIpkFilename( *pkg ), destination, destDir );
}
}
}
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( QString( "Finished - status=" ) + (ret ? "success" : "failure") );
emit outputText( "Finished" );
emit outputText( "" );
return ret;
}
+void Ipkg :: removeStatusEntry()
+{
+ QString statusFile = destDir;
+ if ( statusFile.right( 1 ) != "/" )
+ statusFile += "/";
+ statusFile += "usr/lib/ipkg/status";
+ QString outStatusFile = statusFile + ".tmp";
+
+ emit outputText( "" );
+ emit outputText( "Removing status entry..." );
+ emit outputText( QString( "status file - " )+ statusFile );
+ emit outputText( QString( "package - " )+ package );
+
+ ifstream in( statusFile );
+ ofstream out( outStatusFile );
+ if ( !in.is_open() )
+ {
+ emit outputText( QString( "Couldn't open status file - " )+ statusFile );
+ return;
+ }
+
+ if ( !out.is_open() )
+ {
+ emit outputText( QString( "Couldn't create tempory status file - " )+ outStatusFile );
+ return;
+ }
+
+ char line[1001];
+ char k[21];
+ char v[1001];
+ QString key;
+ QString value;
+ do
+ {
+ in.getline( line, 1000 );
+ if ( in.eof() )
+ continue;
+
+ k[0] = '\0';
+ v[0] = '\0';
+
+ sscanf( line, "%[^:]: %[^\n]", k, v );
+ key = k;
+ value = v;
+ key = key.stripWhiteSpace();
+ value = value.stripWhiteSpace();
+ if ( key == "Package" && value == package )
+ {
+ // Ignore all lines up to next empty
+ do
+ {
+ in.getline( line, 1000 );
+ if ( in.eof() || QString( line ).stripWhiteSpace() == "" )
+ continue;
+ } while ( !in.eof() && QString( line ).stripWhiteSpace() != "" );
+ }
+
+ out << line << endl;
+ } while ( !in.eof() );
+
+ in.close();
+ out.close();
+
+ // Remove old status file and put tmp stats file in its place
+ remove( statusFile );
+ rename( outStatusFile, statusFile );
+}
+
int Ipkg :: executeIpkgCommand( QString &cmd, const QString option )
{
FILE *fp = NULL;
char line[130];
QString lineStr, lineStrOld;
int ret = false;
diff --git a/noncore/settings/aqpkg/ipkg.h b/noncore/settings/aqpkg/ipkg.h
index 63588c4..55e9ff4 100644
--- a/noncore/settings/aqpkg/ipkg.h
+++ b/noncore/settings/aqpkg/ipkg.h
@@ -58,15 +58,16 @@ private:
QString destination;
QString destDir;
int flags;
QString runtimeDir;
QList<QString> *dependantPackages;
int executeIpkgCommand( QString &cmd, const QString option );
+ void removeStatusEntry();
void linkPackage( const QString &packFileName, const QString &dest, const QString &destDir );
QStringList* getList( const QString &packageFilename, const QString &destDir );
void processFileList( const QStringList *fileList, const QString &destDir );
void processLinkDir( const QString &file, const QString &baseDir, const QString &destDir );
};
#endif