Load data in /usr/share/metainfo

ximion · 4f05cc123672f15e4d94dd36c5b6ffe8f3d574ae · ximion committed Apr 12, 2016 · Apr 12, 2016 · 4f05cc1
1 parent d4e57d2
commit 4f05cc123672f15e4d94dd36c5b6ffe8f3d574ae
Unified Split

Showing with 4 additions and 4 deletions.

+1 −1 dep11/extractor.py

+2 −2 dep11/generator.py

+1 −1 dep11/parsers.py
diff --git a/dep11/extractor.py b/dep11/extractor.py
@@ -198,7 +198,7 @@ def _process_pkg(self, pkg, metainfo_files=None):
 
         # process all AppStream XML files
         for meta_file in metainfo_files:
-            if meta_file.endswith(".xml") and meta_file.startswith("usr/share/appdata"):
+            if meta_file.endswith(".xml") and (meta_file.startswith("usr/share/metainfo") or meta_file.startswith("usr/share/appdata")):
                 xml_content = None
                 cpt = Component(self._suite_name, pkg)
 
diff --git a/dep11/generator.py b/dep11/generator.py
@@ -399,10 +399,10 @@ def prepopulate_cache(self, suite_name):
                         if 'usr/share/applications/' in f:
                             ignore = False
                             break
-                        if 'usr/share/appdata/' in f:
+                        if 'usr/share/metainfo/' in f:
                             ignore = False
                             break
-                        if '/pkgconfig/' in f:
+                        if 'usr/share/appdata/' in f:
                             ignore = False
                             break
 
diff --git a/dep11/parsers.py b/dep11/parsers.py
@@ -290,7 +290,7 @@ def _parse_releases_tag(relstag):
 
 def read_appstream_upstream_xml(cpt, xml_content):
     '''
-    Reads the appdata from the xml file in usr/share/appdata.
+    Reads the metadata from the xml file in usr/share/metainfo.
     Sets ComponentData properties
     '''