author | harlekin <harlekin> | 2002-08-30 10:31:09 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-08-30 10:31:09 (UTC) |
commit | 40bac3f8b24cd8b02c685dae3efa57c6de09452b (patch) (unidiff) | |
tree | b294e82541b26cacb10389b53b228e32bb12dee1 /noncore/unsupported/oipkg/package.cpp | |
parent | 57e4c1b05208650eaac76268eb9bb25a1caa2184 (diff) | |
download | opie-40bac3f8b24cd8b02c685dae3efa57c6de09452b.zip opie-40bac3f8b24cd8b02c685dae3efa57c6de09452b.tar.gz opie-40bac3f8b24cd8b02c685dae3efa57c6de09452b.tar.bz2 |
blind fix by robert to make it work with new ipkg format too
Diffstat (limited to 'noncore/unsupported/oipkg/package.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/unsupported/oipkg/package.cpp | 23 |
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 | |||
@@ -55,16 +55,16 @@ void Package::init( PackageManagerSettings *s ) | |||
55 | } | 55 | } |
56 | 56 | ||
57 | Package::Package( QStringList pack, PackageManagerSettings *s , QObject *parent, const char *name ) | 57 | Package::Package( QStringList pack, PackageManagerSettings *s , QObject *parent, const char *name ) |
58 | : QObject(parent,name) | 58 | : QObject(parent,name) |
59 | { | 59 | { |
60 | init(s); | 60 | init(s); |
61 | parsePackage( pack ); | 61 | parsePackage( pack ); |
62 | } | 62 | } |
63 | 63 | ||
64 | Package::Package( QString n, PackageManagerSettings *s, QObject *parent, const char *name ) | 64 | Package::Package( QString n, PackageManagerSettings *s, QObject *parent, const char *name ) |
65 | : QObject(parent,name) | 65 | : QObject(parent,name) |
66 | { | 66 | { |
67 | init(s); | 67 | init(s); |
68 | if ( !QFile::exists( n ) ) | 68 | if ( !QFile::exists( n ) ) |
69 | { | 69 | { |
70 | _name = QString( n ); | 70 | _name = QString( n ); |
@@ -117,9 +117,9 @@ void Package::setValue( QString n, QString t ) | |||
117 | { | 117 | { |
118 | _fileName = t; | 118 | _fileName = t; |
119 | // }else if ( n == "Size") | 119 | // }else if ( n == "Size") |
120 | // { | 120 | // { |
121 | // | 121 | // |
122 | //}else if ( n == "MD5Sum") | 122 | //}else if ( n == "MD5Sum") |
123 | //{ | 123 | //{ |
124 | 124 | ||
125 | }else if ( n == "Description") | 125 | }else if ( n == "Description") |
@@ -384,9 +384,9 @@ void Package::setDest( QString d ) | |||
384 | } | 384 | } |
385 | 385 | ||
386 | void Package::setOn() | 386 | void Package::setOn() |
387 | { | 387 | { |
388 | _toProcess = true; | 388 | _toProcess = true; |
389 | } | 389 | } |
390 | 390 | ||
391 | bool Package::link() | 391 | bool Package::link() |
392 | { | 392 | { |
@@ -400,10 +400,17 @@ void Package::setLink(bool b) | |||
400 | } | 400 | } |
401 | 401 | ||
402 | void Package::parseIpkgFile( QString file) | 402 | void Package::parseIpkgFile( QString file) |
403 | { | 403 | { |
404 | system("tar xzf "+file+" -C /tmp"); | 404 | // 20020830 |
405 | system("tar xzf /tmp/control.tar.gz -C /tmp"); | 405 | // a quick hack to make oipkg understand the new ipk format |
406 | // neu: ar pf PACKAGE control.tar.gz | tar xfOz - ./control > /tmp/control | ||
407 | if (! system("ar pf "+file+" control.tar.gz | tar xfOz - ./control > /tmp/control") ) | ||
408 | { | ||
409 | //#old tar ipk format | ||
410 | system("tar xzf "+file+" -C /tmp"); | ||
411 | system("tar xzf /tmp/control.tar.gz -C /tmp"); | ||
412 | } | ||
406 | QFile f("/tmp/control"); | 413 | QFile f("/tmp/control"); |
407 | if ( f.open(IO_ReadOnly) ) | 414 | if ( f.open(IO_ReadOnly) ) |
408 | { | 415 | { |
409 | QTextStream t( &f ); | 416 | QTextStream t( &f ); |
@@ -414,9 +421,9 @@ void Package::parseIpkgFile( QString file) | |||
414 | } | 421 | } |
415 | f.close(); | 422 | f.close(); |
416 | parsePackage( pack ); | 423 | parsePackage( pack ); |
417 | } | 424 | } |
418 | 425 | ||
419 | } | 426 | } |
420 | 427 | ||
421 | //QString Package::getPackageName() | 428 | //QString Package::getPackageName() |
422 | //{ | 429 | //{ |
@@ -435,9 +442,9 @@ void Package::setName(QString n) | |||
435 | } | 442 | } |
436 | 443 | ||
437 | QDict<QString>* Package::getFields() | 444 | QDict<QString>* Package::getFields() |
438 | { | 445 | { |
439 | return &_values; | 446 | return &_values; |
440 | } | 447 | } |
441 | 448 | ||
442 | QString Package::status() | 449 | QString Package::status() |
443 | { | 450 | { |