[osmium-tool] 01/03: Bugfix: osmium fileinfo --show-variables didn't work properly.

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to tag v1.1.1
in repository osmium-tool.

commit d8fa7b320084dcfdea0f2fd839e047bf6bbb43a2
Author: Jochen Topf <jochen at topf.org>
Date:   Sat Jul 4 16:04:45 2015 +0200

    Bugfix: osmium fileinfo --show-variables didn't work properly.
---
 CHANGELOG.md             | 2 ++
 src/command_fileinfo.cpp | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7c13733..10035ce 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Fixed
 
+- Osmium fileinfo --show-variables didn't work properly.
+
 
 ## [1.1.0] - 2015-07-04
 
diff --git a/src/command_fileinfo.cpp b/src/command_fileinfo.cpp
index 9597232..462c33e 100644
--- a/src/command_fileinfo.cpp
+++ b/src/command_fileinfo.cpp
@@ -506,8 +506,6 @@ bool CommandFileinfo::setup(const std::vector<std::string>& arguments) {
     po::store(po::command_line_parser(arguments).options(desc).positional(positional).run(), vm);
     po::notify(vm);
 
-    setup_input_file(vm);
-
     if (vm.count("extended")) {
         m_extended = true;
     }
@@ -547,6 +545,8 @@ bool CommandFileinfo::setup(const std::vector<std::string>& arguments) {
     if (vm.count("show-variables")) {
         std::copy(known_values.cbegin(), known_values.cend(), std::ostream_iterator<std::string>(std::cout, "\n"));
         return false;
+    } else {
+        setup_input_file(vm);
     }
 
     if (vm.count("get")) {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osmium-tool.git