[SCM] Kaboom - Debian KDE 3->4 migration tool branch, master, updated. master/0.9.1-3-gf4aae85

George Kiagiadakis gkiagia-guest at alioth.debian.org
Mon Mar 16 22:09:03 UTC 2009


The following commit has been merged in the master branch:
commit f4aae85952497d41bef92ce29dfefdc0db1a68ba
Author: George Kiagiadakis <gkiagia at users.sourceforge.net>
Date:   Tue Mar 17 00:08:37 2009 +0200

    Don't be too harsh if a file cannot be read.

diff --git a/diroperations/recursivedirjob.cpp b/diroperations/recursivedirjob.cpp
index c2297c7..0f11e8b 100644
--- a/diroperations/recursivedirjob.cpp
+++ b/diroperations/recursivedirjob.cpp
@@ -22,7 +22,6 @@
 #include <QtCore/QDebug>
 
 #include <cstdio> //for perror()
-#include <cstdlib> //for abort()
 
 //for lstat()
 #define _FILE_OFFSET_BITS 64
@@ -128,7 +127,8 @@ static quint64 stat_size(const QString & fileName)
     struct stat buf;
     if ( ::lstat(QFile::encodeName(fileName), &buf) != 0 ) {
         perror("lstat");
-        abort();
+        qWarning() << "lstat failed on" << fileName;
+        return 0;
     }
     return buf.st_size;
 }

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



More information about the pkg-kde-commits mailing list