[SCM] Kaboom - Debian KDE 3->4 migration tool branch, master, updated. 45021862d7e39cd86264f5d5a296b23fda27a015
George Kiagiadakis
gkiagia-guest at alioth.debian.org
Sun Feb 22 21:41:31 UTC 2009
The following commit has been merged in the master branch:
commit 45021862d7e39cd86264f5d5a296b23fda27a015
Author: George Kiagiadakis <gkiagia at users.sourceforge.net>
Date: Sun Feb 22 23:35:24 2009 +0200
Always create the destination directory in recursiveCpDir().
This is to handle the case where the dir exists and the RemoveDestination option is set,
so it is removed in the if (dest.exists()) block and then it needs to be created again.
If it already exists and it is not removed (OverWrite option), mkdir will just
silently fail, so there is no reason to use it conditionally.
diff --git a/diroperations/diroperations.cpp b/diroperations/diroperations.cpp
index 1eee9c0..179636c 100644
--- a/diroperations/diroperations.cpp
+++ b/diroperations/diroperations.cpp
@@ -137,10 +137,10 @@ void recursiveCpDir(const QString & sourcePath, const QString & destPath, CopyOp
recursiveRmDir(destPath, pd);
else if ( !(options & OverWrite) )
throw Exception(Exception::FileOrDirectoryExists, destPath);
- } else {
- dest.mkdir(dest.absolutePath());
}
+ dest.mkdir(dest.absolutePath());
+
QDir::Filters filters = QDir::AllEntries | QDir::NoDotAndDotDot | QDir::Hidden | QDir::System | QDir::CaseSensitive;
QFileInfoList currentList = source.entryInfoList( filters, QDir::DirsLast );
QFileInfo currentItem;
--
Kaboom - Debian KDE 3->4 migration tool
More information about the pkg-kde-commits
mailing list