summaryrefslogtreecommitdiff
authorharlekin <harlekin>2002-08-30 10:31:09 (UTC)
committer harlekin <harlekin>2002-08-30 10:31:09 (UTC)
commit40bac3f8b24cd8b02c685dae3efa57c6de09452b (patch) (side-by-side diff)
treeb294e82541b26cacb10389b53b228e32bb12dee1
parent57e4c1b05208650eaac76268eb9bb25a1caa2184 (diff)
downloadopie-40bac3f8b24cd8b02c685dae3efa57c6de09452b.zip
opie-40bac3f8b24cd8b02c685dae3efa57c6de09452b.tar.gz
opie-40bac3f8b24cd8b02c685dae3efa57c6de09452b.tar.bz2
blind fix by robert to make it work with new ipkg format too
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/unsupported/oipkg/package.cpp23
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
@@ -51,24 +51,24 @@ void Package::init( PackageManagerSettings *s )
_dest = settings->getDestinationName();
_link = settings->createLinks();
_versions=0;
_version="";
}
Package::Package( QStringList pack, PackageManagerSettings *s , QObject *parent, const char *name )
: QObject(parent,name)
-{
+{
init(s);
parsePackage( pack );
}
Package::Package( QString n, PackageManagerSettings *s, QObject *parent, const char *name )
: QObject(parent,name)
-{
+{
init(s);
if ( !QFile::exists( n ) )
{
_name = QString( n );
}else{
pvDebug(4,"remote file: "+n);
parseIpkgFile( n );
_useFileName = true;
@@ -113,17 +113,17 @@ void Package::setValue( QString n, QString t )
// }else if ( n == "Depends")
// {
}else if ( n == "Filename")
{
_fileName = t;
// }else if ( n == "Size")
// {
-//
+//
// }else if ( n == "MD5Sum")
// {
}else if ( n == "Description")
{
setDesc( t );
}else if ( n == "Status")
{
@@ -380,47 +380,54 @@ QString Package::dest()
void Package::setDest( QString d )
{
if ( d == "remote") _useFileName = true;
else _dest = d;
}
void Package::setOn()
{
- _toProcess = true;
+ _toProcess = true;
}
bool Package::link()
{
if ( _dest == "root" || (!installed() && !_toProcess) ) return false;
return _link;
}
void Package::setLink(bool b)
{
_link = b;
}
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");
if ( f.open(IO_ReadOnly) )
{
QTextStream t( &f );
QStringList pack;
while ( !t.eof() )
{
pack << t.readLine();
}
f.close();
parsePackage( pack );
}
-
+
}
//QString Package::getPackageName()
//{
// if ( _packageName.isEmpty() ) return _name;
// else return _packageName;
//}
@@ -431,17 +438,17 @@ void Package::instalFromFile(bool iff)
void Package::setName(QString n)
{
_displayName = n;
}
QDict<QString>* Package::getFields()
{
- return &_values;
+ return &_values;
}
QString Package::status()
{
return _status;
}
bool Package::isOld()