blind fix by robert to make it work with new ipkg format too

1 files changed, 15 insertions, 8 deletions

diff --git a/noncore/unsupported/oipkg/package.cpp b/noncore/unsupported/oipkg/package.cpp
index 7aaa240..1054a1d 100644
--- a/noncore/unsupported/oipkg/package.cpp
+++ b/noncore/unsupported/oipkg/package.cpp
@@ -58,3 +58,3 @@ Package::Package( QStringList pack, PackageManagerSettings *s , QObject *parent,
 	: QObject(parent,name)
-{	
+{
   init(s);
@@ -65,3 +65,3 @@ Package::Package( QString n, PackageManagerSettings *s, QObject *parent, const c
 	: QObject(parent,name)
-{	
+{
   init(s);
@@ -120,3 +120,3 @@ void Package::setValue( QString n, QString t )
 // 	{
-//  	
+//
 //	}else if ( n == "MD5Sum")
@@ -387,3 +387,3 @@ void Package::setOn()
 {
-	_toProcess = true;	
+	_toProcess = true;
 }
@@ -403,4 +403,11 @@ void Package::parseIpkgFile( QString file)
 {
-	system("tar xzf "+file+" -C /tmp");
- 	system("tar xzf /tmp/control.tar.gz -C /tmp");
+// 20020830
+// a quick hack to make oipkg understand the new ipk format
+// neu:  ar pf PACKAGE control.tar.gz | tar xfOz - ./control > /tmp/control
+    if (! system("ar pf "+file+" control.tar.gz | tar xfOz - ./control > /tmp/control") )
+    {
+//#old tar ipk format
+        system("tar xzf "+file+" -C /tmp");
+        system("tar xzf /tmp/control.tar.gz -C /tmp");
+    }
   QFile f("/tmp/control");
@@ -417,3 +424,3 @@ void Package::parseIpkgFile( QString file)
   }
-	
+
 }
@@ -438,3 +445,3 @@ QDict<QString>* Package::getFields()
 {
-	return &_values;	
+	return &_values;
 }