diff options
| author | Jay Berkenbilt <ejb@ql.org> | 2019-04-21 02:03:59 +0200 |
|---|---|---|
| committer | Jay Berkenbilt <ejb@ql.org> | 2019-04-21 03:00:43 +0200 |
| commit | 12b159118a67abf2c2d47492c6c502f5f5720d7f (patch) | |
| tree | b13cc1a2566bf6f2f2d1cb4d94b2baf2e0544267 /qpdf | |
| parent | 2b011f9d817fa2cb2e8ed0b410f655e9e61cb6fa (diff) | |
| download | qpdf-12b159118a67abf2c2d47492c6c502f5f5720d7f.tar.zst | |
Compare versions between CLI and library
Diffstat (limited to 'qpdf')
| -rw-r--r-- | qpdf/qpdf.cc | 13 | ||||
| -rw-r--r-- | qpdf/qtest/qpdf.test | 2 |
2 files changed, 14 insertions, 1 deletions
diff --git a/qpdf/qpdf.cc b/qpdf/qpdf.cc index 495816c3..5bf36c5b 100644 --- a/qpdf/qpdf.cc +++ b/qpdf/qpdf.cc @@ -30,6 +30,8 @@ static int const EXIT_WARNING = 3; static char const* whoami = 0; +static std::string expected_version = "8.4.0"; + struct PageSpec { PageSpec(std::string const& filename, @@ -993,6 +995,17 @@ ArgParser::argPositional(char* arg) void ArgParser::argVersion() { + if (expected_version != QPDF::QPDFVersion()) + { + std::cerr << "***\n" + << "WARNING: qpdf CLI from version " << expected_version + << " is using library version " << QPDF::QPDFVersion() + << ".\n" + << "This probably means you have multiple versions of qpdf installed\n" + << "and don't have your library path configured correctly.\n" + << "***" + << std::endl; + } std::cout << whoami << " version " << QPDF::QPDFVersion() << std::endl << "Run " << whoami << " --copyright to see copyright and license information." diff --git a/qpdf/qtest/qpdf.test b/qpdf/qtest/qpdf.test index 6ee0ecfe..3eea8df3 100644 --- a/qpdf/qtest/qpdf.test +++ b/qpdf/qtest/qpdf.test @@ -667,7 +667,7 @@ $n_tests += 3; $td->runtest("qpdf version", {$td->COMMAND => "qpdf --version"}, - {$td->REGEXP => "qpdf version \\S+\n.*", $td->EXIT_STATUS => 0}, + {$td->REGEXP => ".*qpdf version \\S+\n.*", $td->EXIT_STATUS => 0}, $td->NORMALIZE_NEWLINES); $td->runtest("qpdf copyright contains version too", {$td->COMMAND => "qpdf --copyright"}, |