aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2018-03-16 13:37:09 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2018-03-16 13:37:09 +0200
commitbe961c92f1306ad16392eb90dbaa579353c9033e (patch)
tree6e4f141681b3d498077073de6efec95dda7653cc
parentbc24eec7208187e171fd61ced7130fd8e2828257 (diff)
Fix bug in pkg-build version iteration handling
-rw-r--r--bpkg/pkg-build.cxx12
1 files changed, 10 insertions, 2 deletions
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;
}