Changeset 4876

Show
Ignore:
Timestamp:
08/12/08 22:22:18 (3 months ago)
Author:
desai
Message:

Fix minestruct with -g (Resolves Ticket #593)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/bcfg2/src/lib/Server/Admin/Minestruct.py

    r4862 r4876  
    4444        root = lxml.etree.Element("Base") 
    4545        self.log.info("Found %d extra entries" % (len(extra))) 
    46         if len(groups) == 0: 
    47             for tag, name in extra: 
    48                 self.log.info("%s: %s" % (tag, name)) 
    49                 lxml.etree.SubElement(root, tag, name=name) 
    50         else: 
    51             groups_root = lxml.etree.Element("Group", name=groups[0]) 
    52             root.append(groups_root)  
    53             for i in range (1, len(groups)): 
    54                 temp = lxml.etree.Element("Group", name=groups[i]) 
    55                 groups_root.append(temp) 
    56                 groups_root = temp 
    57             for entry in extra: 
    58                 self.log.info("%s: %s" % (tag, name)) 
    59                 lxml.etree.SubElement(groups_root, tag, name=name) 
     46        add_point = root 
     47        for g in groups: 
     48            add_point = lxml.etree.SubElement(add_point, "Group", name=g) 
     49        for tag, name in extra: 
     50            self.log.info("%s: %s" % (tag, name)) 
     51            lxml.etree.SubElement(add_point, tag, name=name) 
    6052 
    6153        tree = lxml.etree.ElementTree(root)