Merge pull request #1517 from FarmBot/staging

v15.4.10
FarmBot · Jul 4, 2024 · b42e9ab · b42e9ab
2 parents ebe7a24 + d0c0441
commit b42e9ab
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+# 15.4.10
+
+ * Prevent unnecessary scheduler exit upon encountering duplicate variables when one is a placeholder.
+
 # 15.4.9
 
  * Add `tool.flow_rate_ml_per_s`.

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-15.4.9
+15.4.10
diff --git a/lib/celery/compilers/scope.ex b/lib/celery/compilers/scope.ex
@@ -37,13 +37,17 @@ defmodule FarmbotOS.Celery.Compiler.Scope do
       if has_key?(state, key) do
         state
       else
-        set(state, key, value)
+        reckless_set(state, key, value)
       end
     end)
   end
 
   def has_key?(scope, label), do: Map.has_key?(scope.declarations, label)
 
+  def reckless_set(scope, key, value) do
+    %{scope | declarations: Map.put(scope.declarations, key, value)}
+  end
+
   @nothing %AST{kind: :nothing, args: %{}, body: []}
   @not_allowed [
     :location_placeholder,
@@ -65,7 +69,7 @@ defmodule FarmbotOS.Celery.Compiler.Scope do
       declr = Map.put(scope.declarations, key, @nothing)
       %{scope | declarations: declr, valid: false}
     else
-      %{scope | declarations: Map.put(scope.declarations, key, value)}
+      reckless_set(scope, key, value)
     end
   end