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

The following commit has been merged in the master branch:
commit a9256db32b65b49b70910355b1a9290c483f0d76
Author: Robin Mills <robin at clanmills.com>
Date:   Sat Jan 9 12:25:54 2016 +0000

    #1148 Correction to r4175 to fix test suite breaker.  We can only use the -pX short cut when option -eXx is used.
---
 src/actions.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/actions.cpp b/src/actions.cpp
index 1ca9447..0a0e2b8 100644
--- a/src/actions.cpp
+++ b/src/actions.cpp
@@ -1963,8 +1963,11 @@ namespace {
                 std::cout << _("Writing XMP data from") << " " << source
                           << " " << _("to") << " " << target << std::endl;
             }
+
             // #1148 use XMP packet if there are no XMP modification commands
-            if ( Params::instance().modifyCmds_.size() == 0 ) {
+            if ( Params::instance().modifyCmds_.size() == 0
+            &&   Params::instance().target_ == (Params::ctXmp | Params::ctXmpSidecar) // option -eXx
+            ) {
                 // http://www.cplusplus.com/reference/ostream/ostream/ostream/
                 std::filebuf fb;
                 fb.open (target,std::ios::out);

-- 
exiv2 packaging