[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 95027c0664403f5dcd7b7a935571806f6c070fe1
Author: George Kiagiadakis <gkiagia at users.sourceforge.net>
Date: Sun Feb 22 23:29:29 2009 +0200
Do not attempt to copy special files (sockets, pipes, etc...). It will fail...
diff --git a/diroperations/diroperations.cpp b/diroperations/diroperations.cpp
index e56c9d9..233920f 100644
--- a/diroperations/diroperations.cpp
+++ b/diroperations/diroperations.cpp
@@ -196,7 +196,7 @@ void recursiveCpDir(const QString & sourcePath, const QString & destPath, CopyOp
stack.push(currentList);
currentList = source.entryInfoList( filters, QDir::DirsLast );
}
- else
+ else if ( currentItem.isFile() )
{
if ( options & OverWrite ) {
if ( QFile::exists(dest.absoluteFilePath(currentName)) &&
@@ -206,6 +206,10 @@ void recursiveCpDir(const QString & sourcePath, const QString & destPath, CopyOp
if ( !QFile::copy( source.absoluteFilePath(currentName), dest.absoluteFilePath(currentName) ) )
throw Exception(Exception::CopyFail, source.absoluteFilePath(currentName));
}
+ else
+ {
+ qDebug() << "Ignoring special file" << source.absoluteFilePath(currentName);
+ }
if ( pd ) {
bytesCopied += currentItem.size();
--
Kaboom - Debian KDE 3->4 migration tool
More information about the pkg-kde-commits
mailing list