From 89b7b287ad7f69ad75011e1f6000ef7f3302c042 Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Mon, 15 Jun 2009 08:56:34 +0000 Subject: [PATCH] Add groups to index --- pisi/index.py | 9 +++++++++ pisi/specfile.py | 2 ++ 2 files changed, 11 insertions(+) diff --git a/pisi/index.py b/pisi/index.py index c26b0f3a..66145b48 100644 --- a/pisi/index.py +++ b/pisi/index.py @@ -99,6 +99,8 @@ class Index(xmlfile.XmlFile): self.add_spec(os.path.join(root, fn), repo_uri) if fn == 'distribution.xml': self.add_distro(os.path.join(root, fn)) + if fn == 'groups.xml': + self.add_groups(os.path.join(root, fn)) try: obsoletes_list = map(str, self.distribution.obsoletes) @@ -147,6 +149,13 @@ class Index(xmlfile.XmlFile): self.packages.append(md.package) + def add_groups(self, path): + ctx.ui.info("Adding groups.xml to index...") + groups_xml = group.Groups() + groups_xml.read(path) + for group in groups_xml.groups: + self.groups.append(group) + def add_components(self, path): ctx.ui.info("Adding components.xml to index...") components_xml = component.Components() diff --git a/pisi/specfile.py b/pisi/specfile.py index 47ccb81b..25d982f7 100644 --- a/pisi/specfile.py +++ b/pisi/specfile.py @@ -32,6 +32,7 @@ import pisi.dependency import pisi.replace import pisi.conflict import pisi.component as component +import pisi.group as group import pisi.util as util import pisi.db @@ -288,6 +289,7 @@ class SpecFile(xmlfile.XmlFile): t_Packages = [ [Package], autoxml.mandatory, "Package"] t_History = [ [Update], autoxml.mandatory] t_Components = [ [component.Component], autoxml.optional, "Component"] + t_Groups = [ [group.Group], autoxml.optional, "Group"] def getSourceVersion(self): return self.history[0].version