[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 03/16] qapi: Eliminate superfluous QAPISchema attrib
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH 03/16] qapi: Eliminate superfluous QAPISchema attribute input_dir |
Date: |
Fri, 12 Jun 2015 16:51:01 +0200 |
Signed-off-by: Markus Armbruster <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] [PATCH 00/16] qapi: Miscellaneous fixes and cleanups, Markus Armbruster, 2015/06/12
- [Qemu-devel] [PATCH 01/16] MAINTAINERS: Fix up QAPI and QAPI schema file patterns, Markus Armbruster, 2015/06/12
- [Qemu-devel] [PATCH 04/16] qapi: Eliminate superfluous QAPISchema attribute include_hist, Markus Armbruster, 2015/06/12
- [Qemu-devel] [PATCH 03/16] qapi: Eliminate superfluous QAPISchema attribute input_dir,
Markus Armbruster <=
- [Qemu-devel] [PATCH 02/16] qapi: Drop bogus command from docs, Markus Armbruster, 2015/06/12
- [Qemu-devel] [PATCH 13/16] qapi-types: Don't filter out expressions with 'gen', Markus Armbruster, 2015/06/12
- [Qemu-devel] [PATCH 12/16] qapi: Catch and reject flat union branch of array type, Markus Armbruster, 2015/06/12
- [Qemu-devel] [PATCH 06/16] qapi: Fix file name in error messages for included files, Markus Armbruster, 2015/06/12
- [Qemu-devel] [PATCH 07/16] qapi: Simplify inclusion cycle detection, Markus Armbruster, 2015/06/12