Merge pull request #57 from dkillick/udunits_xml_from_cfg

Use site config to specify UDUNITS2 XML database location
SciTools · Jun 22, 2016 · 044db70 · 044db70
2 parents 94e1838 + 18c7bb6
commit 044db70
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/cf_units/__init__.py b/cf_units/__init__.py
@@ -380,8 +380,10 @@ def suppress_errors():
         # relative to sys.prefix to support environments such as conda.
         _ud_system = _ut_read_xml(None)
         if _ud_system is None:
-            _alt_xml_path = os.path.join(sys.prefix, 'share',
-                                         'udunits', 'udunits2.xml')
+            _alt_xml_path = config.get_option(
+                'System', 'udunits2_xml_path',
+                default=os.path.join(sys.prefix, 'share', 'udunits',
+                                     'udunits2.xml'))
             _ud_system = _ut_read_xml(_alt_xml_path.encode())
     if not _ud_system:
         _status_msg = 'UNKNOWN'

diff --git a/cf_units/etc/site.cfg.template b/cf_units/etc/site.cfg.template
@@ -1,2 +1,3 @@
 [System]
 udunits2_path = /path/to/libudunits2.so
+udunits2_xml_path = /path/to/udunits2.xml