summaryrefslogtreecommitdiff
authortille <tille>2002-04-24 09:33:16 (UTC)
committer tille <tille>2002-04-24 09:33:16 (UTC)
commit8f67324fd1a60c165ae7043b9457f911b9690e43 (patch) (side-by-side diff)
tree89956792ee33b839a463082e8a43bd1d919afaf9
parentd3fe6dead3c84f1cd94b913c3c6c8657485d70a1 (diff)
downloadopie-8f67324fd1a60c165ae7043b9457f911b9690e43.zip
opie-8f67324fd1a60c165ae7043b9457f911b9690e43.tar.gz
opie-8f67324fd1a60c165ae7043b9457f911b9690e43.tar.bz2
fixed: ipkg c version issues
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/unsupported/oipkg/TODO1
-rw-r--r--noncore/unsupported/oipkg/pmipkg.cpp36
2 files changed, 33 insertions, 4 deletions
diff --git a/noncore/unsupported/oipkg/TODO b/noncore/unsupported/oipkg/TODO
index d81e873..c53ca93 100644
--- a/noncore/unsupported/oipkg/TODO
+++ b/noncore/unsupported/oipkg/TODO
@@ -6,5 +6,6 @@
* parse "to install" and "to remove" from status
* install local file
* install to dest with click on packet
+* qcop
* error handling
* manage links
diff --git a/noncore/unsupported/oipkg/pmipkg.cpp b/noncore/unsupported/oipkg/pmipkg.cpp
index 681f2d4..94ca824 100644
--- a/noncore/unsupported/oipkg/pmipkg.cpp
+++ b/noncore/unsupported/oipkg/pmipkg.cpp
@@ -7,6 +7,7 @@
#include <qpe/process.h>
#include <qpe/resource.h>
+#include <qpe/config.h>
#include <qpe/stringutil.h>
#include <qpe/qcopenvelope_qws.h>
#include <qdir.h>
@@ -23,6 +24,9 @@
#include "runwindow.h"
+#define PARSE_FILELIST
+// #define IPKG_FILELIST
+
PmIpkg::PmIpkg( PackageManagerSettings* s, QWidget* p, const char * name, WFlags f )
// : RunWindow ( p, name, f )
: QObject ( p )
@@ -52,7 +56,7 @@ int PmIpkg::runIpkg(const QString& args)
cmd += " -dest "+settings->getDestinationName();
cmd += " -force-defaults ";
- out( "Starting to "+ args+"<br>\n");
+ out( "<hr><br>Starting to "+ args+"<br>\n");
cmd += args;
out( "running:<br>\n"+cmd+"<br>\n" );
int r = 0;
@@ -66,6 +70,7 @@ int PmIpkg::runIpkg(const QString& args)
#ifdef SYSTEM
QString redirect = "/tmp/oipkg.pipe";
cmd += " | tee "+redirect+" 2>&1";
+ pvDebug(2, "running >"+cmd+"<");
r = system(cmd.latin1());
QFile f( redirect );
while ( ! f.open(IO_ReadOnly) ) {};
@@ -85,14 +90,30 @@ int PmIpkg::runIpkg(const QString& args)
return r;
}
-void PmIpkg::makeLinks(QString file)
+void PmIpkg::makeLinks(QString pack)
{
+ pvDebug( 2, "PmIpkg::makeLinks "+ pack);
out( "<br>creating links<br>" );
QString dest = settings->getDestinationUrl();
- out("for package "+file+" in "+dest+"<br>");
- system(("ipkg -d "+dest+" files "+file+"> /tmp/oipkg.pipe 2>&1").latin1());
+ out("for package "+pack+" in "+dest+"<br>");
+#ifdef IPKG_FILELIST
+ system(("ipkg -d "+dest+" files "+pack+"> /tmp/oipkg.pipe 2>&1").latin1());
QFile f( "/tmp/oipkg.pipe" );
while ( ! f.open(IO_ReadOnly) ) {};
+#endif
+#ifdef PARSE_FILELIST
+ {
+ Config cfg( "oipkg", Config::User );
+ cfg.setGroup( "Common" );
+ QString statusDir = cfg.readEntry( "statusDir", "" );
+ }
+ QString fn = dest+"/"+statusDir+"/info/"+pack+".list";
+ QFile f( fn );
+ if ( ! f.open(IO_ReadOnly) )
+ {
+ out( "<b>Panik!</b> Could not open:<br>"+fn );
+ };
+#endif
QTextStream t( &f );
QString fp;
while ( !t.eof() )
@@ -105,7 +126,14 @@ void PmIpkg::makeLinks(QString file)
void PmIpkg::processLinkDir( QString file, QString dest )
{
+
+#ifdef PARSE_FILELIST
+ QString destFile = file;
+ file = dest+"/"+file;
+#endif
+#ifdef IPKG_FILELIST
QString destFile = file.right( file.length() - dest.length() );
+#endif
QFileInfo fileInfo( file );
if ( fileInfo.isDir() )
{