Commit 0d1d9b9399bc07cbdf975adb2919343c225d223c

Thomas de Grivel 2015-07-23T19:39:37

Check if properties are in conflict before warning.

diff --git a/core/properties.lisp b/core/properties.lisp
index 91306e1..b1fab84 100644
--- a/core/properties.lisp
+++ b/core/properties.lisp
@@ -41,12 +41,14 @@
   `(getf ,properties ,property +undefined+))
 
 (defmethod merge-property-values (resource property old new)
-  (warn "Conflicting values for ~A property ~A
+  (unless (equalp old new)
+    (warn "Conflicting values for property ~A in
+~A
  old: ~S
  new: ~S
 Keeping old value by default."
-        resource property old new)
-  old)
+          property resource old new)
+    old))
 
 #+nil ;; Is this really the right thing ?
 (defmethod merge-property-values ((resource t)