git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' into eucalyptus-devel
[sfa.git]
/
sfa
/
util
/
rspecHelper.py
diff --git
a/sfa/util/rspecHelper.py
b/sfa/util/rspecHelper.py
index
f6c860b
..
1ccc984
100755
(executable)
--- a/
sfa/util/rspecHelper.py
+++ b/
sfa/util/rspecHelper.py
@@
-36,6
+36,8
@@
def merge_rspecs(rspecs):
# the resulting tree
rspec = None
for input_rspec in rspecs:
+ # ignore empty strings as returned with used call_ids
+ if not input_rspec: continue
try:
tree = etree.parse(StringIO(input_rspec))
except etree.XMLSyntaxError: