[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=1775274

The following commit has been merged in the master branch:
commit 177527402d095df1768e8cae6c5b41467b033025
Author: Robin Mills <robin at clanmills.com>
Date:   Fri Mar 18 08:42:10 2016 +0000

    #1074 Fixed 'overwrite?' prompt in command: exiv2 -eC image
---
 src/actions.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/actions.cpp b/src/actions.cpp
index e1d0d38..f5c563d 100644
--- a/src/actions.cpp
+++ b/src/actions.cpp
@@ -1070,7 +1070,9 @@ namespace Action {
         if (!rc
             && !(Params::instance().target_ & Params::ctXmpSidecar)
             && !(Params::instance().target_ & Params::ctThumb)
-            && !(Params::instance().target_ & Params::ctPreview)) {
+            && !(Params::instance().target_ & Params::ctPreview)
+            && !(Params::instance().target_ & Params::ctIccProfile)
+            ) {
             std::string exvPath = Params::instance().target_ & Params::ctStdInOut
                                 ? "-" : newFilePath(path_, ".exv");
             if (dontOverwrite(exvPath)) return 0;

-- 
exiv2 packaging