| author | andyq <andyq> | 2003-01-18 12:40:22 (UTC) |
|---|---|---|
| committer | andyq <andyq> | 2003-01-18 12:40:22 (UTC) |
| commit | 2ad938f8470eb460ea5dae6ca3844c4dcc6cd991 (patch) (side-by-side diff) | |
| tree | 52235c5f9f4ecc469b1d0ae57f1482e1cf2c475a | |
| parent | 1c9b38eaee495c13d5d3fcbd818965339cc6d0ce (diff) | |
| download | opie-2ad938f8470eb460ea5dae6ca3844c4dcc6cd991.zip opie-2ad938f8470eb460ea5dae6ca3844c4dcc6cd991.tar.gz opie-2ad938f8470eb460ea5dae6ca3844c4dcc6cd991.tar.bz2 | |
Fixed relinking of files when upgrade selected (now removes old links first and recreates them after), also cut down on spurious failed to link errors on linking
| -rw-r--r-- | noncore/settings/aqpkg/ipkg.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/noncore/settings/aqpkg/ipkg.cpp b/noncore/settings/aqpkg/ipkg.cpp index 29bf40d..51eca8b 100644 --- a/noncore/settings/aqpkg/ipkg.cpp +++ b/noncore/settings/aqpkg/ipkg.cpp @@ -119,9 +119,9 @@ bool Ipkg :: runIpkg( ) qApp->processEvents(); - // If we are removing packages and make links option is selected + // If we are removing, reinstalling or upgrading packages and make links option is selected // create the links - if ( option == "remove" || option == "reinstall" ) + if ( option == "remove" || option == "reinstall" || option == "upgrade" ) { createLinks = false; if ( flags & MAKE_LINKS ) @@ -141,7 +141,7 @@ bool Ipkg :: runIpkg( ) if ( aborted ) return false; - if ( option == "install" || option == "reinstall" ) + if ( option == "install" || option == "reinstall" || option == "upgrade" ) { // If we are not removing packages and make links option is selected // create the links @@ -522,8 +522,8 @@ void Ipkg :: processLinkDir( const QString &file, const QString &destDir, const QDir d; d.mkdir( linkFile, true ); } - else - emit outputText( QString( "Directory " ) + linkFile + " already exists" ); +// else +// emit outputText( QString( "Directory " ) + linkFile + " already exists" ); } else @@ -552,11 +552,14 @@ void Ipkg :: processLinkDir( const QString &file, const QString &destDir, const { QDir d; bool rc = d.rmdir( linkFile, true ); + if ( rc ) + { text = (rc ? "Removed " : "Failed to remove "); text += linkFile; emit outputText( text ); } } } + } } |