summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/settings/aqpkg/ipkg.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/noncore/settings/aqpkg/ipkg.cpp b/noncore/settings/aqpkg/ipkg.cpp
index 1efe030..407abe9 100644
--- a/noncore/settings/aqpkg/ipkg.cpp
+++ b/noncore/settings/aqpkg/ipkg.cpp
@@ -325,193 +325,193 @@ void Ipkg::processFinished()
/*
int Ipkg :: executeIpkgCommand( QString &cmd, const QString option )
{
FILE *fp = NULL;
char line[130];
QString lineStr, lineStrOld;
int ret = false;
fp = popen( (const char *) cmd, "r");
if ( fp == NULL )
{
cout << "Couldn't execute " << cmd << "! err = " << fp << endl;
QString text;
text.sprintf( "Couldn't execute %s! See stdout for error code", (const char *)cmd );
emit outputText( text );
}
else
{
while ( fgets( line, sizeof line, fp) != NULL )
{
lineStr = line;
lineStr=lineStr.left( lineStr.length()-1 );
if ( lineStr != lineStrOld )
{
//See if we're finished
if ( option == "install" || option == "reinstall" )
{
// Need to keep track of any dependant packages that get installed
// so that we can create links to them as necessary
if ( lineStr.startsWith( "Installing " ) )
{
int start = lineStr.find( " " ) + 1;
int end = lineStr.find( " ", start );
QString *package = new QString( lineStr.mid( start, end-start ) );
dependantPackages->append( package );
}
}
if ( option == "update" )
{
if (lineStr.contains("Updated list"))
ret = true;
}
else if ( option == "download" )
{
if (lineStr.contains("Downloaded"))
ret = true;
}
else
{
if (lineStr.contains("Done"))
ret = true;
}
emit outputText( lineStr );
}
lineStrOld = lineStr;
qApp->processEvents();
}
pclose(fp);
}
return ret;
}
*/
void Ipkg :: linkPackage( const QString &packFileName, const QString &dest, const QString &destDir )
{
if ( dest == "root" || dest == "/" )
return;
qApp->processEvents();
QStringList *fileList = getList( packFileName, destDir );
qApp->processEvents();
processFileList( fileList, destDir );
delete fileList;
}
QStringList* Ipkg :: getList( const QString &packageFilename, const QString &destDir )
{
QString packageFileDir = destDir+"/usr/lib/ipkg/info/"+packageFilename+".list";
QFile f( packageFileDir );
cout << "Try to open " << packageFileDir << endl;
if ( !f.open(IO_ReadOnly) )
{
// Couldn't open from dest, try from /
cout << "Could not open:" << packageFileDir << endl;
f.close();
packageFileDir = "/usr/lib/ipkg/info/"+packageFilename+".list";
f.setName( packageFileDir );
qDebug( "Try to open %s", packageFileDir.latin1() );
if ( ! f.open(IO_ReadOnly) )
{
- qDebug( "Could not open: %s", packageFileDir );
+ qDebug( "Could not open: %s", packageFileDir.latin1() );
emit outputText( QString( "Could not open :" ) + packageFileDir );
return (QStringList*)0;
}
}
QStringList *fileList = new QStringList();
QTextStream t( &f );
while ( !t.eof() )
*fileList += t.readLine();
f.close();
return fileList;
}
void Ipkg :: processFileList( const QStringList *fileList, const QString &destDir )
{
if ( !fileList || fileList->isEmpty() )
return;
QString baseDir = ROOT;
if ( createLinks == true )
{
for ( uint i=0; i < fileList->count(); i++ )
{
processLinkDir( (*fileList)[i], baseDir, destDir );
qApp->processEvents();
}
}
else
{
for ( int i = fileList->count()-1; i >= 0 ; i-- )
{
processLinkDir( (*fileList)[i], baseDir, destDir );
qApp->processEvents();
}
}
}
void Ipkg :: processLinkDir( const QString &file, const QString &destDir, const QString &baseDir )
{
QString sourceFile = baseDir + file;
QString linkFile = destDir;
if ( file.startsWith( "/" ) && destDir.right( 1 ) == "/" )
{
linkFile += file.mid( 1 );
}
else
{
linkFile += file;
}
QString text;
if ( createLinks )
{
// If this file is a directory (ends with a /) and it doesn't exist,
// we need to create it
if ( file.right(1) == "/" )
{
QFileInfo f( linkFile );
if ( !f.exists() )
{
emit outputText( QString( "Creating directory " ) + linkFile );
QDir d;
d.mkdir( linkFile, true );
}
else
emit outputText( QString( "Directory " ) + linkFile + " already exists" );
}
else
{
int rc = symlink( sourceFile, linkFile );
text = (rc == 0 ? "Linked " : "Failed to link ");
text += sourceFile + " to " + linkFile;
emit outputText( text );
}
}
else
{
QFileInfo f( linkFile );
if ( f.exists() )
{
if ( f.isFile() )
{
QFile f( linkFile );
bool rc = f.remove();
text = (rc ? "Removed " : "Failed to remove ");
text += linkFile;
emit outputText( text );
}
else if ( f.isDir() )
{
QDir d;
bool rc = d.rmdir( linkFile, true );