[SCM] kio packaging branch, master, updated. 552adf213029efd058f860cd200b3194cfd59258

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kio.git;a=commitdiff;h=5c48d8a

The following commit has been merged in the master branch:
commit 5c48d8ac086b19098a4624a88f3a1316df906841
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Mar 13 19:53:50 2015 +0100

    New patch: report_error_removing_dirs
---
 debian/changelog                          |  1 +
 debian/patches/report_error_removing_dirs | 51 +++++++++++++++++++++++++++++++
 debian/patches/series                     |  1 +
 3 files changed, 53 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 10bebeb..074db6d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ kio (5.7.0-1) experimental; urgency=medium
 
   * New upstream release (5.7.0).
   * New patch: return_on_ACCESS_DENIED
+  * New patch: report_error_removing_dirs
 
  -- Maximiliano Curia <maxy at debian.org>  Fri, 06 Mar 2015 22:57:43 +0100
 
diff --git a/debian/patches/report_error_removing_dirs b/debian/patches/report_error_removing_dirs
new file mode 100644
index 0000000..0ae19df
--- /dev/null
+++ b/debian/patches/report_error_removing_dirs
@@ -0,0 +1,51 @@
+Index: kio/src/core/copyjob.cpp
+===================================================================
+--- kio.orig/src/core/copyjob.cpp	2015-03-13 20:28:14.051523378 +0100
++++ kio/src/core/copyjob.cpp	2015-03-13 20:29:19.672816282 +0100
+@@ -146,6 +146,7 @@
+         , m_bOverwriteAllFiles(false)
+         , m_bOverwriteAllDirs(false)
+         , m_conflictError(0)
++        , m_dirsFailedError(0)
+         , m_reportTimer(0)
+     {
+     }
+@@ -200,6 +201,8 @@
+     bool m_bOverwriteAllFiles;
+     bool m_bOverwriteAllDirs;
+     int m_conflictError;
++    int m_dirsFailedError;
++    QString m_dirsFailedErrorText;
+ 
+     QTimer *m_reportTimer;
+ 
+@@ -1690,6 +1693,10 @@
+         --m_processedFiles; // undo the "start at 1" hack
+         slotReport(); // display final numbers, important if progress dialog stays up
+ 
++        if (m_dirsFailedError) {
++            q->setError(m_dirsFailedError);
++            q->setErrorText(m_dirsFailedErrorText);
++        }
+         q->emitResult();
+     }
+ }
+@@ -1759,12 +1766,14 @@
+ void CopyJobPrivate::slotResultDeletingDirs(KJob *job)
+ {
+     Q_Q(CopyJob);
++    const QUrl url = static_cast<KIO::SimpleJob *>(job)->url();
+     if (job->error()) {
+-        // Couldn't remove directory. Well, perhaps it's not empty
+-        // because the user pressed Skip for a given file in it.
+-        // Let's not display "Could not remove dir ..." for each of those dir !
++        m_dirsFailedError = job->error();
++        m_dirsFailedErrorText = job->errorText();
++        // Remove the parents
++        skip(url, true);
+     } else {
+-        m_successSrcList.append(static_cast<KIO::SimpleJob *>(job)->url());
++        m_successSrcList.append(url);
+     }
+     q->removeSubjob(job);
+     assert(!q->hasSubjobs());
diff --git a/debian/patches/series b/debian/patches/series
index 451ed83..92b49a2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 return_on_ACCESS_DENIED
+report_error_removing_dirs

-- 
kio packaging