author | tille <tille> | 2002-07-01 13:31:20 (UTC) |
---|---|---|
committer | tille <tille> | 2002-07-01 13:31:20 (UTC) |
commit | 1f42fc6dd4ef09b5a9526e81784ab3d05b9300b1 (patch) (side-by-side diff) | |
tree | eaf5284b3841c247c9f048e6c529053ca9ded412 /noncore/unsupported/oipkg/pmipkg.cpp | |
parent | 346ea8fa0d904e940659bc35fad0fc0da8cc7f80 (diff) | |
download | opie-1f42fc6dd4ef09b5a9526e81784ab3d05b9300b1.zip opie-1f42fc6dd4ef09b5a9526e81784ab3d05b9300b1.tar.gz opie-1f42fc6dd4ef09b5a9526e81784ab3d05b9300b1.tar.bz2 |
cosmetics
Diffstat (limited to 'noncore/unsupported/oipkg/pmipkg.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/unsupported/oipkg/pmipkg.cpp | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/noncore/unsupported/oipkg/pmipkg.cpp b/noncore/unsupported/oipkg/pmipkg.cpp index de1f162..4a8a389 100644 --- a/noncore/unsupported/oipkg/pmipkg.cpp +++ b/noncore/unsupported/oipkg/pmipkg.cpp @@ -69,2 +69,3 @@ bool PmIpkg::runIpkg(const QString& args, const QString& dest ) #ifdef OPROCESS + ipkgProcess->kill(); ipkgProcess->clearArguments(); @@ -101,2 +102,4 @@ bool PmIpkg::runIpkg(const QString& args, const QString& dest ) //debug + delete ipkgProcess; + ipkgProcess = new OProcess(); ipkgProcess->clearArguments(); @@ -172,3 +175,3 @@ QStringList* PmIpkg::getList( QString packFileName, QString d ) dest = dest==""?d:dest; - if (dest == "/" ) return 0; + // if (dest == "/" ) return 0; { @@ -178,3 +181,3 @@ QStringList* PmIpkg::getList( QString packFileName, QString d ) } - packFileName = dest+"/"+statusDir+"/info/"+packFileName+".list"; + QString packFileDir = dest+"/"+statusDir+"/info/"+packFileName+".list"; QFile f( packFileName ); @@ -182,5 +185,11 @@ QStringList* PmIpkg::getList( QString packFileName, QString d ) { - pvDebug(1," Panik! Could not open"); - out( "Panik!\n Could not open:\n"+packFileName ); - return (QStringList*)0; + out( "Could not open:\n"+packFileDir ); + f.close(); + packFileDir = "/"+statusDir+"/info/"+packFileName+".list"; + f.setName( packFileDir ); + if ( ! f.open(IO_ReadOnly) ) + { + qDebug(" Panik! Could not open"+packFileDir); + out( "Could not open:\n"+packFileDir+"\n Panik!" ); + } } @@ -192,2 +201,3 @@ QStringList* PmIpkg::getList( QString packFileName, QString d ) } + f.close(); return fileList; @@ -197,2 +207,3 @@ void PmIpkg::linkPackage( QString packFileName, QString dest ) { + if (dest == "root" || dest == "/" ) return; QStringList *fileList = getList( packFileName, dest ); |