Mercurial > treepkg > treepkg
diff treepkg/info/status.py @ 438:3a3cad8f6f60 treepkg-status
review changes
author | Bjoern Ricks <bricks@intevation.de> |
---|---|
date | Thu, 05 Aug 2010 16:21:47 +0000 |
parents | 8be095183151 |
children | 6d65aa725f99 |
line wrap: on
line diff
--- a/treepkg/info/status.py Mon Aug 02 15:36:12 2010 +0000 +++ b/treepkg/info/status.py Thu Aug 05 16:21:47 2010 +0000 @@ -45,13 +45,14 @@ if not node: if required: raise TreepkgInfoException("Element %s is required as child. But" - "parent element is not available.") + "parent element is not available.") return None childs = node.getElementsByTagName(name) if not childs: if required: raise TreepkgInfoException("Element %s is required as child for %s." - "The XML file must be invalid." % (name, node.nodeName)) + "The XML file must be invalid." + % (name, node.nodeName)) return None return childs @@ -66,7 +67,7 @@ self.success = success group = get_packager_group(config) treepkgrootinfo = TreepkgRootInfo(group.name, group.treepkg_dir, - group.tracks_dir) + group.tracks_dir) version = "1.0" self.tpkgroot = TreepkgRoot(version, treepkgrootinfo) tracks = group.get_package_tracks() @@ -134,8 +135,9 @@ pkginfo.add_checksum(checksuminfo) revision.add_package(pkginfo) + class TreepkgRoot: - + def __init__(self, version, info): self.version = version self.info = info @@ -311,8 +313,6 @@ messageele = getChild(statusele, "message") message = getTextFromNode(messageele) treepkgrevisioninfo = TreepkgTrackRevisionInfo(number, rules, message) - treepkgrevisioninfo.packages = [] - treepkgrevisioninfo.logs = [] packagesele = getChild(node, "packages") packageeles = getChilds(packagesele, "package") for packageele in packageeles: @@ -321,8 +321,7 @@ logsele = getChild(node, "logs") logeles = getChilds(logsele, "log") for logele in logeles: - treepkgrevisioninfo.logs.append( - TreepkgLogInfo.fromxml(logele)) + treepkgrevisioninfo.logs.append(TreepkgLogInfo.fromxml(logele)) return treepkgrevisioninfo class TreepkgLogInfo: @@ -394,12 +393,13 @@ path = getTextFromNode(pathele) ptype = node.getAttribute("type") arch = node.getAttribute("arch") - if len(arch) == 0: + if not arch: arch = None packageinfo = TreepkgPackageInfo(name, path, ptype, arch) checksumeles = node.getElementsByTagName("checksum") for checksumele in checksumeles: - packageinfo.checksums.append(TreepkgChecksumInfo.fromxml(checksumele)) + packageinfo.checksums.append( + TreepkgChecksumInfo.fromxml(checksumele)) return packageinfo class TreepkgChecksumInfo: @@ -421,6 +421,6 @@ def fromxml(node): checksum = getTextFromNode(node) ctype = node.getAttribute("type") - if len(ctype) == 0: + if not ctype: return TreepkgChecksumInfo(checksum) return TreepkgChecksumInfo(checksum, ctype)