From b7cf37e1ea69937faef65477afa6cfcd86437206 Mon Sep 17 00:00:00 2001 From: Jeff Vander Stoep Date: Tue, 5 Jan 2016 12:52:50 -0800 Subject: Add setools version Addresses the following error: File "/android_source/AOSP/external/selinux/prebuilts/bin/sesearch.py", line 21, in import setools File "/android_source/AOSP/prebuilts/python/linux-x86/2.7.5/lib/python2.7/site-packages/setools/__init__.py", line 23, in __version__ = pkg_resources.get_distribution("setools").version File "/usr/lib/python2.7/dist-packages/pkg_resources.py", line 344, in get_distribution if isinstance(dist,Requirement): dist = get_provider(dist) File "/usr/lib/python2.7/dist-packages/pkg_resources.py", line 223, in get_provider return working_set.find(moduleOrReq) or require(str(moduleOrReq))[0] File "/usr/lib/python2.7/dist-packages/pkg_resources.py", line 725, in require needed = self.resolve(parse_requirements(requirements)) File "/usr/lib/python2.7/dist-packages/pkg_resources.py", line 628, in resolve raise DistributionNotFound(req) pkg_resources.DistributionNotFound: setools Change-Id: I69b033416e687d77c5839433542ee21056c6b93b --- lib/python2.7/site-packages/setools/__init__.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/lib/python2.7/site-packages/setools/__init__.py b/lib/python2.7/site-packages/setools/__init__.py index 1108706..d86ecdc 100644 --- a/lib/python2.7/site-packages/setools/__init__.py +++ b/lib/python2.7/site-packages/setools/__init__.py @@ -17,13 +17,7 @@ # License along with SETools. If not, see # . # -try: - import pkg_resources - # pylint: disable=no-member - __version__ = pkg_resources.get_distribution("setools").version -except ImportError: # pragma: no cover - __version__ = "unknown" - +__version__ = "3.3.8" # Python classes for policy representation from . import policyrep from .policyrep import SELinuxPolicy -- cgit v1.2.3