| -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 @@ -115,2 +115,3 @@ bool Ipkg :: runIpkg( ) linkPackage( Utils::getPackageNameFromIpkFilename( package ), destination, destDir ); + emit outputText( QString( " " ) ); } @@ -142,2 +143,4 @@ bool Ipkg :: runIpkg( ) { + if ( *pkg == package ) + continue; emit outputText( " " ); @@ -286,3 +289,2 @@ void Ipkg :: processFileList( const QStringList *fileList, const QString &destDi { - cout << "i = " << i << ", Dealing with " << (*fileList)[i] << endl; processLinkDir( (*fileList)[i], baseDir, destDir ); @@ -295,4 +297,14 @@ void Ipkg :: processLinkDir( const QString &file, const QString &destDir, const { + 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; |