author | andyq <andyq> | 2002-10-16 23:08:08 (UTC) |
---|---|---|
committer | andyq <andyq> | 2002-10-16 23:08:08 (UTC) |
commit | 593fe744126a398e2714070137b6f19e398d2c9d (patch) (side-by-side diff) | |
tree | 3cf11467787c4f8860bc8f5f87ceaab87ea8b2f4 /noncore/settings/aqpkg/ipkg.cpp | |
parent | 196a3f566bdc5bd6188f2265e05adbdb519a6e09 (diff) | |
download | opie-593fe744126a398e2714070137b6f19e398d2c9d.zip opie-593fe744126a398e2714070137b6f19e398d2c9d.tar.gz opie-593fe744126a398e2714070137b6f19e398d2c9d.tar.bz2 |
Fixed bug with linking files
Diffstat (limited to 'noncore/settings/aqpkg/ipkg.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/settings/aqpkg/ipkg.cpp | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/noncore/settings/aqpkg/ipkg.cpp b/noncore/settings/aqpkg/ipkg.cpp index f8513e4..6d0edad 100644 --- a/noncore/settings/aqpkg/ipkg.cpp +++ b/noncore/settings/aqpkg/ipkg.cpp @@ -104,24 +104,25 @@ bool Ipkg :: runIpkg( ) qApp->processEvents(); // If we are removing packages and make links option is selected // create the links if ( option == "remove" ) { createLinks = false; if ( flags & MAKE_LINKS ) { emit outputText( QString( "Removing symbolic links...\n" ) ); linkPackage( Utils::getPackageNameFromIpkFilename( package ), destination, destDir ); + emit outputText( QString( " " ) ); } } emit outputText( cmd ); // Execute command dependantPackages = new QList<QString>; dependantPackages->setAutoDelete( true ); ret = executeIpkgCommand( cmd, option ); if ( option == "install" ) @@ -131,24 +132,26 @@ bool Ipkg :: runIpkg( ) createLinks = true; if ( flags & MAKE_LINKS ) { emit outputText( " " ); emit outputText( QString( "Creating symbolic links for " )+ package ); linkPackage( Utils::getPackageNameFromIpkFilename( package ), destination, destDir ); // link dependant packages that were installed with this release QString *pkg; for ( pkg = dependantPackages->first(); pkg != 0; pkg = dependantPackages->next() ) { + if ( *pkg == package ) + continue; emit outputText( " " ); emit outputText( QString( "Creating symbolic links for " )+ (*pkg) ); linkPackage( Utils::getPackageNameFromIpkFilename( *pkg ), destination, destDir ); } } } delete dependantPackages; emit outputText( QString( "Finished - status=" ) + (ret ? "success" : "failure") ); return ret; } @@ -275,35 +278,44 @@ void Ipkg :: processFileList( const QStringList *fileList, const QString &destDi 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-- ) { - cout << "i = " << i << ", Dealing with " << (*fileList)[i] << endl; 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 + 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; |