From 67ce341adfaeeb0fa9467a58983a943dd914a734 Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Tue, 18 Oct 2016 17:10:18 +0800
Subject: [PATCH] master: keep dataset manager consistent when set_dataset is
 called with contradictory attributes

---
 artiq/master/worker_db.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/artiq/master/worker_db.py b/artiq/master/worker_db.py
index e00da8a1e..eb4acf8e9 100644
--- a/artiq/master/worker_db.py
+++ b/artiq/master/worker_db.py
@@ -190,8 +190,12 @@ class DatasetManager:
             broadcast = True
         if broadcast:
             self.broadcast[key] = persist, value
+        elif key in self.broadcast.read:
+            del self.broadcast[key]
         if save:
             self.local[key] = value
+        elif key in self.local:
+            del self.local[key]
 
     def mutate(self, key, index, value):
         target = None