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 | |
parent | 196a3f566bdc5bd6188f2265e05adbdb519a6e09 (diff) | |
download | opie-593fe744126a398e2714070137b6f19e398d2c9d.zip opie-593fe744126a398e2714070137b6f19e398d2c9d.tar.gz opie-593fe744126a398e2714070137b6f19e398d2c9d.tar.bz2 |
Fixed bug with linking files
-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 @@ -112,8 +112,9 @@ bool Ipkg :: runIpkg( ) if ( flags & MAKE_LINKS ) { emit outputText( QString( "Removing symbolic links...\n" ) ); linkPackage( Utils::getPackageNameFromIpkFilename( package ), destination, destDir ); + emit outputText( QString( " " ) ); } } emit outputText( cmd ); @@ -139,8 +140,10 @@ bool Ipkg :: runIpkg( ) // 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 ); } @@ -283,19 +286,28 @@ void Ipkg :: processFileList( const QStringList *fileList, const QString &destDi 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, |