[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=081c3c5

The following commit has been merged in the master branch:
commit 081c3c5e7d37eaaf2259810aa97fb947ed36b070
Author: Robin Mills <robin at clanmills.com>
Date:   Tue Apr 28 14:15:25 2015 +0000

    CID 1296110
---
 src/ssh.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/ssh.cpp b/src/ssh.cpp
index e8ea9de..27478e8 100644
--- a/src/ssh.cpp
+++ b/src/ssh.cpp
@@ -100,15 +100,15 @@ namespace Exiv2 {
 
         scp = ssh_scp_new(session_, SSH_SCP_WRITE, path.c_str());
         if (scp == NULL) {
-            throw Error(1, ssh_get_error(session_));
             rc = SSH_ERROR;
+            throw Error(1, ssh_get_error(session_));
         } else {
             rc = ssh_scp_init(scp);
             if (rc != SSH_OK) {
                 throw Error(1, ssh_get_error(session_));
             } else {
 #ifdef  _MSC_VER
-// S_IRUSR & S_IWUSR not in MSVC (0000400 & 0000200 in /usr/include/sys/stat.h on MacOS-X 10.8) 
+// S_IRUSR & S_IWUSR not in MSVC (0000400 & 0000200 in /usr/include/sys/stat.h on MacOS-X 10.8)
 #define S_IRUSR S_IREAD
 #define S_IWUSR S_IWRITE
 #endif

-- 
exiv2 packaging