pld-builder.new: PLD_Builder/request.py - simplify
glen
glen at pld-linux.org
Tue Aug 31 19:32:02 CEST 2010
Author: glen Date: Tue Aug 31 17:32:02 2010 GMT
Module: pld-builder.new Tag: HEAD
---- Log message:
- simplify
---- Files affected:
pld-builder.new/PLD_Builder:
request.py (1.82 -> 1.83)
---- Diffs:
================================================================
Index: pld-builder.new/PLD_Builder/request.py
diff -u pld-builder.new/PLD_Builder/request.py:1.82 pld-builder.new/PLD_Builder/request.py:1.83
--- pld-builder.new/PLD_Builder/request.py:1.82 Tue Aug 31 18:03:21 2010
+++ pld-builder.new/PLD_Builder/request.py Tue Aug 31 19:31:57 2010
@@ -52,19 +52,21 @@
self.flags = string.split(attr(e, "flags", ""))
for c in e.childNodes:
if is_blank(c): continue
+
+ key = text(c)
if c.nodeType != Element.ELEMENT_NODE:
log.panic("xml: evil group child %d" % c.nodeType)
if c.nodeName == "batch":
self.batches.append(Batch(c))
elif c.nodeName == "requester":
- self.requester = text(c)
+ self.requester = key
self.requester_email = attr(c, "email", "")
elif c.nodeName == "priority":
- self.priority = int(text(c))
+ self.priority = int(key)
elif c.nodeName == "time":
- self.time = int(text(c))
+ self.time = int(key)
elif c.nodeName == "maxjobs":
- self.max_jobs = int(text(c))
+ self.max_jobs = int(key)
else:
log.panic("xml: evil group child (%s)" % c.nodeName)
# note that we also check that group is sorted WRT deps
@@ -154,36 +156,37 @@
self.upgraded = True
for c in e.childNodes:
if is_blank(c): continue
+ key = text(c)
if c.nodeType != Element.ELEMENT_NODE:
log.panic("xml: evil batch child %d" % c.nodeType)
if c.nodeName == "src-rpm":
- self.src_rpm = text(c)
+ self.src_rpm = key
elif c.nodeName == "spec":
# normalize specname, specname is used as buildlog and we don't
# want to be exposed to directory traversal attacks
- self.spec = text(c).split('/')[-1]
+ self.spec = key.split('/')[-1]
elif c.nodeName == "command":
self.spec = "COMMAND"
- self.command = text(c).strip()
+ self.command = key.strip()
self.command_flags = string.split(attr(c, "flags", ""))
elif c.nodeName == "info":
- self.info = text(c)
+ self.info = key
elif c.nodeName == "kernel":
- self.kernel = text(c)
+ self.kernel = key
elif c.nodeName == "target":
- self.target.append(text(c))
+ self.target.append(key)
elif c.nodeName == "skip":
- self.skip.append(text(c))
+ self.skip.append(key)
elif c.nodeName == "branch":
- self.branch = text(c)
+ self.branch = key
elif c.nodeName == "builder":
- self.builders.append(text(c))
- self.builders_status[text(c)] = attr(c, "status", "?")
- self.builders_status_time[text(c)] = attr(c, "time", "0")
+ self.builders.append(key)
+ self.builders_status[key] = attr(c, "status", "?")
+ self.builders_status_time[key] = attr(c, "time", "0")
elif c.nodeName == "with":
- self.bconds_with.append(text(c))
+ self.bconds_with.append(key)
elif c.nodeName == "without":
- self.bconds_without.append(text(c))
+ self.bconds_without.append(key)
else:
log.panic("xml: evil batch child (%s)" % c.nodeName)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/pld-builder.new/PLD_Builder/request.py?r1=1.82&r2=1.83&f=u
More information about the pld-cvs-commit
mailing list