summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2015-06-09 18:32:29 +0200
committerMarkus Armbruster <armbru@redhat.com>2015-06-18 14:12:34 +0200
commit8608d2525186062099a38971c276752e7a38903a (patch)
tree504f996ece17d982bd4c8e72b6beae284be81ef0 /scripts
parent54414047eca5bee7d5ba6e7af5fb251f8635896c (diff)
downloadhqemu-8608d2525186062099a38971c276752e7a38903a.zip
hqemu-8608d2525186062099a38971c276752e7a38903a.tar.gz
qapi: Fix file name in error messages for included files
We print the name as it appears in the include expression. Tools processing error messages want it relative to the working directory. Make it so. Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/qapi.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/scripts/qapi.py b/scripts/qapi.py
index c2eb12b..716e348 100644
--- a/scripts/qapi.py
+++ b/scripts/qapi.py
@@ -101,14 +101,13 @@ class QAPIExprError(Exception):
class QAPISchema:
- def __init__(self, fp, fname = None, include_hist = [],
+ def __init__(self, fp, include_hist = [],
previously_included = [], incl_info = None):
""" include_hist is a stack used to detect inclusion cycles
previously_included is a global state used to avoid multiple
inclusions of the same file"""
abs_fname = os.path.abspath(fp.name)
- if fname is None:
- fname = fp.name
+ fname = fp.name
self.fname = fname
self.include_hist = include_hist + [(fname, abs_fname)]
previously_included.append(abs_fname)
@@ -148,7 +147,7 @@ class QAPISchema:
except IOError, e:
raise QAPIExprError(expr_info,
'%s: %s' % (e.strerror, include))
- exprs_include = QAPISchema(fobj, include, self.include_hist,
+ exprs_include = QAPISchema(fobj, self.include_hist,
previously_included, expr_info)
self.exprs.extend(exprs_include.exprs)
else:
OpenPOWER on IntegriCloud