[SCM] Kaboom - Debian KDE 3->4 migration tool branch, master, updated. 330e7b5ff2c0db662e8d1ef022b54cf69480ff3b

[Sune Vuorela]

The following commit has been merged in the master branch:
commit 330e7b5ff2c0db662e8d1ef022b54cf69480ff3b
Author: Sune Vuorela <sune at vuorela.dk>
Date:   Tue Feb 17 22:31:43 2009 +0100

    actually make my diroperation changes compile

diff --git a/diroperations/diroperations.cpp b/diroperations/diroperations.cpp
index 674cf30..46c49a2 100644
--- a/diroperations/diroperations.cpp
+++ b/diroperations/diroperations.cpp
@@ -211,9 +211,9 @@ void mergeDirs(const QString & sourcePath, const QString & destPath, ProgressDia
 
             if ( currentItem.isSymLink() )
             {
-               if (dest.absoluteFilePath(currentName).exists())
+               if (QFileInfo(dest,"currentname").exists())
                    if(!QFile::remove(dest.absoluteFilePath(currentName)))
-                         throw Exception(Exception::RmFail,currentName.absoluteFilePath());
+                         throw Exception(Exception::RmFail,currentItem.absoluteFilePath());
                 if ( !QFile::link( relativeSymLinkTarget(source.absoluteFilePath(currentName)),
                                     dest.absoluteFilePath(currentName) ) )
                     throw Exception(Exception::CopyFail, currentItem.absoluteFilePath());
@@ -234,8 +234,8 @@ void mergeDirs(const QString & sourcePath, const QString & destPath, ProgressDia
             else
             {
                 if ( QFile::exists( dest.absoluteFilePath(currentName)))
-                     if(!QFile::remove(absoluteFilePath(currentName)))
-                        throw Exception(Exception::RmFail, dest.absoluteFilePath());
+                     if(!QFile::remove(dest.absoluteFilePath(currentName)))
+                        throw Exception(Exception::RmFail, dest.absoluteFilePath(currentName));
                 if ( !QFile::copy( source.absoluteFilePath(currentName), dest.absoluteFilePath(currentName) ) )
                     throw Exception(Exception::CopyFail, source.absoluteFilePath(currentName));
 

-- 
Kaboom - Debian KDE 3->4 migration tool