From 476360684b6dfa60202b4b12654a019fac3045b2 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Tue, 3 Sep 2019 17:14:57 +0300
Subject: Fix worker building latest revision rather than zero revision

---
 bbot/worker/worker.cxx       | 11 ++++++++++-
 tests/integration/testscript |  2 +-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/bbot/worker/worker.cxx b/bbot/worker/worker.cxx
index bfac375..172f5e1 100644
--- a/bbot/worker/worker.cxx
+++ b/bbot/worker/worker.cxx
@@ -582,6 +582,15 @@ build (size_t argc, const char* argv[])
       //
       // bpkg.configure.build
       //
+      // Specify the revision explicitly not to end up with a race condition
+      // building the latest revision rather than the zero revision.
+      //
+      bpkg::version v (tm.version.epoch,
+                       tm.version.upstream,
+                       tm.version.release,
+                       tm.version.effective_revision (),
+                       tm.version.iteration);
+
       r.status |= run_bpkg (
         trace, r.log, wre,
         "-v",
@@ -591,7 +600,7 @@ build (size_t argc, const char* argv[])
         step_args (config_args, step_id::bpkg_configure_build),
         step_args (env_args,    step_id::bpkg_configure_build),
         "--",
-        tm.name.string () + '/' + tm.version.string ());
+        tm.name.string () + '/' + v.string ());
 
       if (!r.status)
         break;
diff --git a/tests/integration/testscript b/tests/integration/testscript
index 9e58fbe..94c57ac 100644
--- a/tests/integration/testscript
+++ b/tests/integration/testscript
@@ -58,7 +58,7 @@ rfp = yes
 
 #\
 pkg = libstudxml
-ver = 1.1.0-b.4.20181203094958.ed267da35ccd
+ver = 1.1.0-b.7.20190619110825.0d1dcfe61f15
 rep_url = https://stage.build2.org/1
 rep_type = pkg
 rfp = yes
-- 
cgit v1.1