mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qapi: Eliminate superfluous QAPISchema attribute input_dir

Browse Source 
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Markus Armbruster 2015-06-09 16:49:13 +02:00
parent 836c3b01d2
commit 12c7079449
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/qapi.py
View File

@ -109,7 +109,6 @@ class QAPISchema:
input_fname = os.path.abspath(fp.name) input_fname = os.path.abspath(fp.name)
if input_relname is None: if input_relname is None:
input_relname = fp.name input_relname = fp.name
self.input_dir = os.path.dirname(input_fname)
self.input_file = input_relname self.input_file = input_relname
self.include_hist = include_hist + [(input_relname, input_fname)] self.include_hist = include_hist + [(input_relname, input_fname)]
previously_included.append(input_fname) previously_included.append(input_fname)
@ -134,7 +133,8 @@ class QAPISchema:
raise QAPIExprError(expr_info, raise QAPIExprError(expr_info,
'Expected a file name (string), got: %s' 'Expected a file name (string), got: %s'
% include) % include)
include_path = os.path.join(self.input_dir, include) include_path = os.path.join(os.path.dirname(input_fname),
include)
for elem in self.include_hist: for elem in self.include_hist:
if include_path == elem[1]: if include_path == elem[1]:
raise QAPIExprError(expr_info, "Inclusion loop for %s" raise QAPIExprError(expr_info, "Inclusion loop for %s"