From be961c92f1306ad16392eb90dbaa579353c9033e Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Fri, 16 Mar 2018 13:37:09 +0200 Subject: Fix bug in pkg-build version iteration handling --- bpkg/pkg-build.cxx | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'bpkg/pkg-build.cxx') diff --git a/bpkg/pkg-build.cxx b/bpkg/pkg-build.cxx index 9d58cc2..65e55d0 100644 --- a/bpkg/pkg-build.cxx +++ b/bpkg/pkg-build.cxx @@ -1256,7 +1256,11 @@ namespace bpkg // Populate the argument list with the latest package versions. // for (const auto& pv: pvs) - eargs.push_back (pv.first + '/' + pv.second.string ()); + { + eargs.push_back ( + pv.first + '/' + pv.second.string (false /* ignore_revision */, + true /* ignore_iteration */)); + } } else // Packages with optional versions in the coma-separated list. { @@ -1304,7 +1308,11 @@ namespace bpkg // Note that the system package is added to the argument list as // it appears originally (see above). // - eargs.push_back (sys ? pkg : n + '/' + ap->version.string ()); + eargs.push_back ( + sys + ? pkg + : n + '/' + ap->version.string (false /* ignore_revision */, + true /* ignore_iteration */)); b = p != string::npos ? p + 1 : p; } -- cgit v1.1