From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55344) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z5Yso-0000IL-0o for qemu-devel@nongnu.org; Thu, 18 Jun 2015 08:25:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z5Ysk-0007hk-5Z for qemu-devel@nongnu.org; Thu, 18 Jun 2015 08:25:25 -0400 Received: from mx1.redhat.com ([209.132.183.28]:32874) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z5Ysk-0007hC-0Z for qemu-devel@nongnu.org; Thu, 18 Jun 2015 08:25:22 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (Postfix) with ESMTPS id AC16C388878 for ; Thu, 18 Jun 2015 12:25:21 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-36.ams2.redhat.com [10.36.116.36]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t5ICPJFa026194 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Thu, 18 Jun 2015 08:25:21 -0400 From: Markus Armbruster Date: Thu, 18 Jun 2015 14:25:06 +0200 Message-Id: <1434630318-22452-4-git-send-email-armbru@redhat.com> In-Reply-To: <1434630318-22452-1-git-send-email-armbru@redhat.com> References: <1434630318-22452-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PULL 03/15] qapi: Eliminate superfluous QAPISchema attribute input_dir List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake --- 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