summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5f58593)
raw | patch | inline | side by side (parent: 5f58593)
author | Sven Velt <sven@velt.de> | |
Thu, 3 Jun 2010 12:38:09 +0000 (14:38 +0200) | ||
committer | Sven Velt <sven@velt.de> | |
Thu, 3 Jun 2010 12:38:09 +0000 (14:38 +0200) |
Signed-off-by: Sven Velt <sven@velt.de>
nagixsc/__init__.py | patch | blob | history |
diff --git a/nagixsc/__init__.py b/nagixsc/__init__.py
index ba961828b503887a2513e6f48d3295c8526eae68..8f11a42dbf37d65b153759e4daf51be852514a50 100644 (file)
--- a/nagixsc/__init__.py
+++ b/nagixsc/__init__.py
return xmldoc
+def xml_merge(xmldocs):
+ checks = []
+ for xmldoc in xmldocs:
+ checks.extend(xml_to_dict(xmldoc))
+ newxmldoc = xml_from_dict(checks)
+ return newxmldoc
+
+
def check_mark_outdated(check, now, maxtimediff, markold):
timedelta = now - check['timestamp']
if timedelta > maxtimediff: