# HG changeset patch # User Drew Perttula # Date 2016-06-01 10:55:41 # Node ID ed27b45526b119f812eedda50a486f80a26c549e # Parent cec677a841424a8a10aa1c8ea9ea248b7645dc9a comments Ignore-this: 5a047815072276be0ab01ff3cf4931a4 diff --git a/light9/collector/device.py b/light9/collector/device.py --- a/light9/collector/device.py +++ b/light9/collector/device.py @@ -42,7 +42,7 @@ def resolve(deviceType, deviceAttr, valu if deviceAttr == L9['color']: rgbs = [hex_to_rgb(v) for v in values] return rgb_to_hex([max(*component) for component in zip(*rgbs)]) - + # angles should perhaps use average; gobo choice use the most-open one return max(values) def toOutputAttrs(deviceType, deviceAttrSettings): diff --git a/light9/rdfdb/graphfile.py b/light9/rdfdb/graphfile.py --- a/light9/rdfdb/graphfile.py +++ b/light9/rdfdb/graphfile.py @@ -130,6 +130,8 @@ class GraphFile(object): print e traceback.print_exc() log.error("%s syntax error", self.path) + # todo: likely bug- if a file has this error upon first + # read, I think we don't retry it right. return except IOError as e: log.error("%s rereading %s: %r", self.path, self.uri, e)