From 417ce421010dd1dd26dc362c8d4e3451f16182a3 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Tue, 18 Jan 2022 14:03:20 +0300
Subject: Temporary support requirements similar to '? cli'

---
 libbpkg/manifest.cxx | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

(limited to 'libbpkg/manifest.cxx')

diff --git a/libbpkg/manifest.cxx b/libbpkg/manifest.cxx
index 6a5ce25..88d4a87 100644
--- a/libbpkg/manifest.cxx
+++ b/libbpkg/manifest.cxx
@@ -1989,9 +1989,23 @@ namespace bpkg
       if (requirements_ && first && tt == type::question)
       {
         r.emplace_back (dependency ());
-        r.enable = lexer_->peek_char () == '(' ? parse_eval () : string ();
+
+        bool eval (lexer_->peek_char () == '(');
+        r.enable = eval ? parse_eval () : string ();
 
         next (t, tt);
+
+        // @@ TMP Treat requirements similar to `? cli` as `cli ?` until
+        //    toolchain 0.15.0 and ODB 2.5.0-b.22 are both released.
+        //
+        if (!eval && tt == type::word)
+        try
+        {
+          r.back ().name = package_name (move (t.value));
+          next (t, tt);
+        }
+        catch (const invalid_argument&) {}
+
         return r;
       }
 
-- 
cgit v1.1