author | andyq <andyq> | 2002-10-16 23:08:08 (UTC) |
---|---|---|
committer | andyq <andyq> | 2002-10-16 23:08:08 (UTC) |
commit | 593fe744126a398e2714070137b6f19e398d2c9d (patch) (unidiff) | |
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) (show 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 | |||
@@ -113,6 +113,7 @@ bool Ipkg :: runIpkg( ) | |||
113 | { | 113 | { |
114 | emit outputText( QString( "Removing symbolic links...\n" ) ); | 114 | emit outputText( QString( "Removing symbolic links...\n" ) ); |
115 | linkPackage( Utils::getPackageNameFromIpkFilename( package ), destination, destDir ); | 115 | linkPackage( Utils::getPackageNameFromIpkFilename( package ), destination, destDir ); |
116 | emit outputText( QString( " " ) ); | ||
116 | } | 117 | } |
117 | } | 118 | } |
118 | 119 | ||
@@ -140,6 +141,8 @@ bool Ipkg :: runIpkg( ) | |||
140 | QString *pkg; | 141 | QString *pkg; |
141 | for ( pkg = dependantPackages->first(); pkg != 0; pkg = dependantPackages->next() ) | 142 | for ( pkg = dependantPackages->first(); pkg != 0; pkg = dependantPackages->next() ) |
142 | { | 143 | { |
144 | if ( *pkg == package ) | ||
145 | continue; | ||
143 | emit outputText( " " ); | 146 | emit outputText( " " ); |
144 | emit outputText( QString( "Creating symbolic links for " )+ (*pkg) ); | 147 | emit outputText( QString( "Creating symbolic links for " )+ (*pkg) ); |
145 | linkPackage( Utils::getPackageNameFromIpkFilename( *pkg ), destination, destDir ); | 148 | linkPackage( Utils::getPackageNameFromIpkFilename( *pkg ), destination, destDir ); |
@@ -284,7 +287,6 @@ void Ipkg :: processFileList( const QStringList *fileList, const QString &destDi | |||
284 | { | 287 | { |
285 | for ( int i = fileList->count()-1; i >= 0 ; i-- ) | 288 | for ( int i = fileList->count()-1; i >= 0 ; i-- ) |
286 | { | 289 | { |
287 | cout << "i = " << i << ", Dealing with " << (*fileList)[i] << endl; | ||
288 | processLinkDir( (*fileList)[i], baseDir, destDir ); | 290 | processLinkDir( (*fileList)[i], baseDir, destDir ); |
289 | qApp->processEvents(); | 291 | qApp->processEvents(); |
290 | } | 292 | } |
@@ -293,8 +295,18 @@ void Ipkg :: processFileList( const QStringList *fileList, const QString &destDi | |||
293 | 295 | ||
294 | void Ipkg :: processLinkDir( const QString &file, const QString &destDir, const QString &baseDir ) | 296 | void Ipkg :: processLinkDir( const QString &file, const QString &destDir, const QString &baseDir ) |
295 | { | 297 | { |
298 | |||
296 | QString sourceFile = baseDir + file; | 299 | QString sourceFile = baseDir + file; |
297 | QString linkFile = destDir + file; | 300 | |
301 | QString linkFile = destDir; | ||
302 | if ( file.startsWith( "/" ) && destDir.right( 1 ) == "/" ) | ||
303 | { | ||
304 | linkFile += file.mid( 1 ); | ||
305 | } | ||
306 | else | ||
307 | { | ||
308 | linkFile += file; | ||
309 | } | ||
298 | QString text; | 310 | QString text; |
299 | if ( createLinks ) | 311 | if ( createLinks ) |
300 | { | 312 | { |