1 files changed, 25 insertions, 12 deletions

diff --git a/noncore/unsupported/oipkg/pmipkg.cpp b/noncore/unsupported/oipkg/pmipkg.cpp
index 0817247..7d0e246 100644
--- a/noncore/unsupported/oipkg/pmipkg.cpp
+++ b/noncore/unsupported/oipkg/pmipkg.cpp
@@ -5,5 +5,3 @@
 
-//#infdef OPROCESS
 #include <opie/oprocess.h>
-//#endif
 #include <qpe/resource.h>
@@ -31,2 +29,4 @@
 
+//#define OPROCESS
+
 PmIpkg::PmIpkg( PackageManagerSettings* s, QWidget* p,  const char * name, WFlags f )
@@ -128,9 +128,9 @@ bool PmIpkg::runIpkg(const QString& args, const QString& dest )
   fp = popen(  (const char *) cmd, "r");
-  if ( !fp ) {
+  if ( fp == NULL ) {
      qDebug("Could not execute '" + cmd + "'! err=%d", fp);
-     pclose(fp);
      out("\nError while executing "+ cmd+"\n\n");
-     return false;
+     ret = false;
   } else {
-     while ( fgets( line, sizeof line, fp)) {
+     while ( fgets( line, sizeof line, fp) != NULL)
+     {
         lineStr = line;
@@ -138,4 +138,3 @@ bool PmIpkg::runIpkg(const QString& args, const QString& dest )
         //Configuring opie-oipkg...Done
-        if (lineStr.contains("Done"))
-          ret = true;
+        if (lineStr.contains("Done")) ret = true;
         if (lineStr!=lineStrOld)
@@ -145,4 +144,4 @@ bool PmIpkg::runIpkg(const QString& args, const QString& dest )
      }
-     pclose(fp);
   }
+  pclose(fp);
 #endif
@@ -236,4 +235,4 @@ void PmIpkg::processLinkDir( QString file, QString dest )
   {
-    const char *instFile = strdup( (file).ascii() );
-    const char *linkFile = strdup(  (destFile).ascii());
+    const char *instFile = strdup( (file).latin1() );
+    const char *linkFile = strdup(  (destFile).latin1());
     if( linkOpp==createLink )
@@ -244,3 +243,3 @@ void PmIpkg::processLinkDir( QString file, QString dest )
   }  else  {
-    const char *linkFile = strdup(  (destFile).ascii());
+    const char *linkFile = strdup(  (destFile).latin1());
     if( linkOpp==removeLink )
@@ -355,2 +354,16 @@ void PmIpkg::install()
           qDebug("install loop %i of %i installing %s",i,to_install.count(),to_install.at(i)->installName().latin1()); //pvDebug
+    if (to_install.at(i)->link())
+          {
+                // hack to have package.list
+                   // in "dest"/usr/lib/ipkg/info/
+            QString rds = settings->getDestinationUrlByName("root");
+            QString lds = settings->getDestinationUrlByName(to_install.at(i)->dest());
+            QString listFile = "usr/lib/ipkg/lists/"+to_install.at(i)->name()+".list";
+             rds += listFile;
+                  lds += listFile;
+                  const char *rd = rds.latin1();
+                const char *ld = lds.latin1();
+                pvDebug(4, "linking: "+rds+" -> "+lds );
+                   symlink( rd, ld );
+          }
           if ( runIpkg("install " + to_install.at(i)->installName(), to_install.at(i)->dest() ))