From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56390) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z3QIm-0003c5-5Z for qemu-devel@nongnu.org; Fri, 12 Jun 2015 10:51:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z3QIh-0001iY-R6 for qemu-devel@nongnu.org; Fri, 12 Jun 2015 10:51:24 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41672) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z3QIh-0001i0-LA for qemu-devel@nongnu.org; Fri, 12 Jun 2015 10:51:19 -0400 From: Markus Armbruster Date: Fri, 12 Jun 2015 16:51:01 +0200 Message-Id: <1434120674-8122-4-git-send-email-armbru@redhat.com> In-Reply-To: <1434120674-8122-1-git-send-email-armbru@redhat.com> References: <1434120674-8122-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH 03/16] qapi: Eliminate superfluous QAPISchema attribute input_dir List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: mdroth@linux.vnet.ibm.com Signed-off-by: Markus Armbruster --- 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