[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:38:29 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=da0a08a
The following commit has been merged in the master branch:
commit da0a08a0ee4df494dd6f951e920b8d71b1f05581
Author: Andreas Huggel <ahuggel at gmx.net>
Date: Sat Jun 9 10:02:54 2007 +0000
Return a code != 0 from main() if an error occurred. Fixes #518.
---
src/exiv2.cpp | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/exiv2.cpp b/src/exiv2.cpp
index ba4169b..d73d756 100644
--- a/src/exiv2.cpp
+++ b/src/exiv2.cpp
@@ -138,22 +138,24 @@ int main(int argc, char* const argv[])
assert(task.get());
// Process all files
+ int rc = 0;
int n = 1;
int s = static_cast<int>(params.files_.size());
int w = s > 9 ? s > 99 ? 3 : 2 : 1;
- Params::Files::const_iterator e = params.files_.end();
- for (Params::Files::const_iterator i = params.files_.begin(); i != e; ++i) {
+ for (Params::Files::const_iterator i = params.files_.begin();
+ i != params.files_.end(); ++i) {
if (params.verbose_) {
std::cout << _("File") << " " << std::setw(w) << n++ << "/" << s << ": "
<< *i << std::endl;
}
- task->run(*i);
+ int ret = task->run(*i);
+ if (rc == 0) rc = ret;
}
taskFactory.cleanup();
params.cleanup();
- return 0;
+ return rc;
} // main
// *****************************************************************************
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list