[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 03/15] qapi: Eliminate superfluous QAPISchema attribu
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL 03/15] qapi: Eliminate superfluous QAPISchema attribute input_dir |
Date: |
Thu, 18 Jun 2015 14:25:06 +0200 |
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
scripts/qapi.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/scripts/qapi.py b/scripts/qapi.py
index f96a777..683669e 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"
--
1.9.3
- [Qemu-devel] [PULL 00/15] QAPI patches, Markus Armbruster, 2015/06/18
- [Qemu-devel] [PULL 02/15] qapi: Drop bogus command from docs, Markus Armbruster, 2015/06/18
- [Qemu-devel] [PULL 01/15] MAINTAINERS: Fix up QAPI and QAPI schema file patterns, Markus Armbruster, 2015/06/18
- [Qemu-devel] [PULL 03/15] qapi: Eliminate superfluous QAPISchema attribute input_dir,
Markus Armbruster <=
- [Qemu-devel] [PULL 05/15] qapi: Fix file name in error messages for included files, Markus Armbruster, 2015/06/18
- [Qemu-devel] [PULL 13/15] qapi-types: Drop unused members parameters, Markus Armbruster, 2015/06/18
- [Qemu-devel] [PULL 09/15] qapi: Better separate the different kinds of helpers, Markus Armbruster, 2015/06/18
- [Qemu-devel] [PULL 08/15] qapi: Move exprs checking from parse_schema() to check_exprs(), Markus Armbruster, 2015/06/18
- [Qemu-devel] [PULL 12/15] qapi-types: Don't filter out expressions with 'gen', Markus Armbruster, 2015/06/18
- [Qemu-devel] [PULL 07/15] qapi: Fix to reject stray 't', 'f' and 'n', Markus Armbruster, 2015/06/18
- [Qemu-devel] [PULL 06/15] qapi: Simplify inclusion cycle detection, Markus Armbruster, 2015/06/18
- [Qemu-devel] [PULL 11/15] qapi: Catch and reject flat union branch of array type, Markus Armbruster, 2015/06/18
- [Qemu-devel] [PULL 15/15] qapi-types: Bury code dead since commit 6b5abc7, Markus Armbruster, 2015/06/18
- [Qemu-devel] [PULL 04/15] qapi: Improve a couple of confusing variable names, Markus Armbruster, 2015/06/18