summaryrefslogtreecommitdiff
authortille <tille>2002-07-05 12:05:38 (UTC)
committer tille <tille>2002-07-05 12:05:38 (UTC)
commita332e5e111b0c9ef8eb0836876a4ff386c660514 (patch) (side-by-side diff)
treefe327e0daace261a53d69a28c99355d63ce9012a
parent1ba879b2be7ad4ae390a351922bd476474d5dce7 (diff)
downloadopie-a332e5e111b0c9ef8eb0836876a4ff386c660514.zip
opie-a332e5e111b0c9ef8eb0836876a4ff386c660514.tar.gz
opie-a332e5e111b0c9ef8eb0836876a4ff386c660514.tar.bz2
fixed linking bug
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/unsupported/oipkg/pmipkg.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/noncore/unsupported/oipkg/pmipkg.cpp b/noncore/unsupported/oipkg/pmipkg.cpp
index 4a8a389..d29036b 100644
--- a/noncore/unsupported/oipkg/pmipkg.cpp
+++ b/noncore/unsupported/oipkg/pmipkg.cpp
@@ -159,59 +159,62 @@ bool PmIpkg::runIpkg(const QString& args, const QString& dest )
#endif
//out( "Finished!");
pvDebug(2,QString(ret?"success\n":"failure\n"));
return ret;
}
void PmIpkg::makeLinks(Package *pack)
{
pvDebug( 2, "PmIpkg::makeLinks "+ pack->name());
QString pn = pack->name();
linkPackage( pack->packageName(), pack->dest() );
}
QStringList* PmIpkg::getList( QString packFileName, QString d )
{
QString dest = settings->getDestinationUrlByName( d );
dest = dest==""?d:dest;
// if (dest == "/" ) return 0;
{
Config cfg( "oipkg", Config::User );
cfg.setGroup( "Common" );
QString statusDir = cfg.readEntry( "statusDir", "" );
}
QString packFileDir = dest+"/"+statusDir+"/info/"+packFileName+".list";
- QFile f( packFileName );
+ QFile f( packFileDir );
+ qDebug("Try to open %s", packFileDir.latin1());
if ( ! f.open(IO_ReadOnly) )
{
out( "Could not open:\n"+packFileDir );
f.close();
packFileDir = "/"+statusDir+"/info/"+packFileName+".list";
f.setName( packFileDir );
+ qDebug("Try to open %s", packFileDir.latin1());
if ( ! f.open(IO_ReadOnly) )
{
qDebug(" Panik! Could not open"+packFileDir);
out( "Could not open:\n"+packFileDir+"\n Panik!" );
+ return (QStringList*)0;
}
}
QStringList *fileList = new QStringList();
QTextStream t( &f );
while ( !t.eof() )
{
*fileList += t.readLine();
}
f.close();
return fileList;
}
void PmIpkg::linkPackage( QString packFileName, QString dest )
{
if (dest == "root" || dest == "/" ) return;
QStringList *fileList = getList( packFileName, dest );
processFileList( fileList, dest );
delete fileList;
}
void PmIpkg::processFileList( QStringList *fileList, QString d )
{
if (!fileList) return;
for (uint i=0; i < fileList->count(); i++)