[jhbuild] xml dep_type: reverse check to the path of the docbook XML catalog



commit 858a37da04de392deaebbdb9387f5b2b8cbdafe5
Author: Antoine Jacoutot <ajacoutot gnome org>
Date:   Thu May 28 09:51:02 2015 +0200

    xml dep_type: reverse check to the path of the docbook XML catalog
    
    First look at /etc/xml/catalog and fallback to XDG_DATA_DIRS if it does not
    exist. This unbreaks detecting docbook requirements on OpenBSD.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=749192

 jhbuild/utils/systeminstall.py |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/jhbuild/utils/systeminstall.py b/jhbuild/utils/systeminstall.py
index c5ebd0c..5b3432f 100644
--- a/jhbuild/utils/systeminstall.py
+++ b/jhbuild/utils/systeminstall.py
@@ -161,12 +161,13 @@ def systemdependencies_met(module_name, sysdeps, config):
                 return False
 
         elif dep_type == 'xml':
-            for d in os.environ['XDG_DATA_DIRS'].split(':'):
-                xml_catalog = os.path.join(d, 'xml', 'catalog')
-                if os.path.exists(xml_catalog):
-                    break
-            else:
-                xml_catalog = '/etc/xml/catalog'
+            xml_catalog = '/etc/xml/catalog'
+
+            if not os.path.exists(xml_catalog):
+                for d in os.environ['XDG_DATA_DIRS'].split(':'):
+                    xml_catalog = os.path.join(d, 'xml', 'catalog')
+                    if os.path.exists(xml_catalog):
+                        break
 
             try:
                 # no xmlcatalog installed will (correctly) fail the check


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]