[SCM] KDE Development Platform Libraries module packaging branch, master, updated. debian/4.14.0-1-5-gc1e385f

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kde4libs.git;a=commitdiff;h=852f9cc

The following commit has been merged in the master branch:
commit 852f9cc411ad184d1eb074ed20839d20e6a02f88
Author: Maximiliano Curia <maxy at debian.org>
Date:   Tue Sep 16 18:56:16 2014 +0200

    New upstream patch: upstream-copyjob.cpp.diff
---
 debian/changelog                         |  1 +
 debian/patches/series                    |  1 +
 debian/patches/upstream-copyjob.cpp.diff | 29 +++++++++++++++++++++++++++++
 3 files changed, 31 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index b7424e2..3aed8f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ kde4libs (4:4.14.1-1~) UNRELEASED; urgency=medium
 
   * New upstream release (4.14.1).
   * New patch: skip_kmountpointtest_if_no_mtab
+  * New upstream patch: upstream-copyjob.cpp.diff
 
  -- Maximiliano Curia <maxy at debian.org>  Fri, 12 Sep 2014 20:30:45 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index 55548a6..209bf0f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -29,3 +29,4 @@ disable_bogus_test.diff
 disable_bogus_tests
 fix_solidlex_destroy_signature.patch
 skip_kmountpointtest_if_no_mtab
+upstream-copyjob.cpp.diff
diff --git a/debian/patches/upstream-copyjob.cpp.diff b/debian/patches/upstream-copyjob.cpp.diff
new file mode 100644
index 0000000..02564c2
--- /dev/null
+++ b/debian/patches/upstream-copyjob.cpp.diff
@@ -0,0 +1,29 @@
+diff --git a/kio/kio/copyjob.cpp b/kio/kio/copyjob.cpp
+index 713255b..ec1030c 100644
+--- a/kio/kio/copyjob.cpp
++++ b/kio/kio/copyjob.cpp
+@@ -340,15 +340,21 @@ void CopyJobPrivate::slotResultStating( KJob *job )
+     if ( destinationState == DEST_NOT_STATED ) {
+         if ( m_dest.isLocalFile() ) { //works for dirs as well
+             QString path = m_dest.toLocalFile();
+-            if (m_asMethod) {
++            QFileInfo fileInfo(path);
++            if (m_asMethod || !fileInfo.exists()) {
+                 // In copy-as mode, we want to check the directory to which we're
+                 // copying. The target file or directory does not exist yet, which
+                 // might confuse KDiskFreeSpaceInfo.
+-                path = QFileInfo(path).absolutePath();
++                path = fileInfo.absolutePath();
+             }
+             KFileSystemType::Type fsType = KFileSystemType::fileSystemType( path );
+             if ( fsType != KFileSystemType::Nfs && fsType != KFileSystemType::Smb  && fsType != KFileSystemType::Ramfs ) {
+-                m_freeSpace = KDiskFreeSpaceInfo::freeSpaceInfo( path ).available();
++                KDiskFreeSpaceInfo freeSpaceInfo = KDiskFreeSpaceInfo::freeSpaceInfo(path);
++                if (freeSpaceInfo.isValid()) {
++                    m_freeSpace = freeSpaceInfo.available();
++                } else {
++                    kDebug() << "Couldn't determine free space information for" << path;
++                }
+             }
+             //TODO actually preliminary check is even more valuable for slow NFS/SMB mounts,
+             //but we need to find a way to report connection errors to user

-- 
KDE Development Platform Libraries module packaging