From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id E02CF1381F3 for ; Sat, 24 Nov 2012 19:44:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9A6B221C096; Sat, 24 Nov 2012 19:44:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2C21821C096 for ; Sat, 24 Nov 2012 19:44:06 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4635E33D841 for ; Sat, 24 Nov 2012 19:44:05 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 559) id 0A30F20C65; Sat, 24 Nov 2012 19:44:03 +0000 (UTC) From: "Mike Frysinger (vapier)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, vapier@gentoo.org Subject: [gentoo-commits] gentoo-projects commit in pax-utils: lddtree.py X-VCS-Repository: gentoo-projects X-VCS-Files: lddtree.py X-VCS-Directories: pax-utils X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: <20121124194404.0A30F20C65@flycatcher.gentoo.org> Date: Sat, 24 Nov 2012 19:44:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: b4ab43c7-9713-494a-8029-5147fad56aa0 X-Archives-Hash: d1f88a975ac36e4780ba65ad6cc3372a vapier 12/11/24 19:44:03 Modified: lddtree.py Log: lddtree.py: simplify osabi compat logic a bit with suggestion from David James Revision Changes Path 1.15 pax-utils/lddtree.py file : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/pax-utils/lddtree.py?rev=1.15&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-projects/pax-utils/lddtree.py?rev=1.15&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/pax-utils/lddtree.py?r1=1.14&r2=1.15 Index: lddtree.py =================================================================== RCS file: /var/cvsroot/gentoo-projects/pax-utils/lddtree.py,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- lddtree.py 24 Nov 2012 17:01:48 -0000 1.14 +++ lddtree.py 24 Nov 2012 19:44:03 -0000 1.15 @@ -2,7 +2,7 @@ # Copyright 2012 Gentoo Foundation # Copyright 2012 Mike Frysinger # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-projects/pax-utils/lddtree.py,v 1.14 2012/11/24 17:01:48 vapier Exp $ +# $Header: /var/cvsroot/gentoo-projects/pax-utils/lddtree.py,v 1.15 2012/11/24 19:44:03 vapier Exp $ """Read the ELF dependency tree and show it @@ -173,10 +173,9 @@ compat_sets = ( frozenset(['ELFOSABI_NONE', 'ELFOSABI_SYSV', 'ELFOSABI_LINUX']), ) + osabis = frozenset([osabi1, osabi2]) for cs in compat_sets: - cs1 = cs | set([osabi1]) - cs2 = cs | set([osabi2]) - if cs1 == cs2: + if osabis.issubset(cs): return True return False else: @@ -311,7 +310,7 @@ def _ShowVersion(_option, _opt, _value, _parser): - id = '$Id: lddtree.py,v 1.14 2012/11/24 17:01:48 vapier Exp $'.split() + id = '$Id: lddtree.py,v 1.15 2012/11/24 19:44:03 vapier Exp $'.split() print('%s-%s %s %s' % (id[1].split('.')[0], id[2], id[3], id[4])) sys.exit(0)