pull in additional changes from 2.0 branch.

[monitor.git] / monitor / database / zabbixapi / model.py

diff --git a/monitor/database/zabbixapi/model.py b/monitor/database/zabbixapi/model.py
index 74407f9..674e2c2 100644 (file)
--- a/monitor/database/zabbixapi/model.py
+++ b/monitor/database/zabbixapi/model.py
@@ -22,7 +22,10 @@ options_defaults['autosetup'] = False
 from elixir.statements import Statement
 from sqlalchemy import Sequence
 
-import defines
+try:
+       import defines
+except:
+       print "WARNING: no defines.py available"
 
 from monitor.database.dborm import zab_metadata, zab_session