diff options
| author | Markus Armbruster <armbru@redhat.com> | 2015-06-09 16:49:13 +0200 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2015-06-18 14:12:33 +0200 |
| commit | 12c707944927b8aa42752198dcf419a0bafe5d33 (patch) | |
| tree | e268c80e2176e5cfc2531a3bffe6cca480127066 /scripts/qapi.py | |
| parent | 836c3b01d2630192d6f5a941ca073bc8d650574b (diff) | |
| download | focaccia-qemu-12c707944927b8aa42752198dcf419a0bafe5d33.tar.gz focaccia-qemu-12c707944927b8aa42752198dcf419a0bafe5d33.zip | |
qapi: Eliminate superfluous QAPISchema attribute input_dir
Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com>
Diffstat (limited to 'scripts/qapi.py')
| -rw-r--r-- | scripts/qapi.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/qapi.py b/scripts/qapi.py index f96a7772e5..683669ecc0 100644 --- a/scripts/qapi.py +++ b/scripts/qapi.py @@ -109,7 +109,6 @@ class QAPISchema: input_fname = os.path.abspath(fp.name) if input_relname is None: input_relname = fp.name - self.input_dir = os.path.dirname(input_fname) self.input_file = input_relname self.include_hist = include_hist + [(input_relname, input_fname)] previously_included.append(input_fname) @@ -134,7 +133,8 @@ class QAPISchema: raise QAPIExprError(expr_info, 'Expected a file name (string), got: %s' % 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: if include_path == elem[1]: raise QAPIExprError(expr_info, "Inclusion loop for %s" |