From b33b4f42d5b6334383d011200c6d184119d1ed2c Mon Sep 17 00:00:00 2001 From: Dan Walsh Date: Thu, 31 Oct 2013 12:08:56 -0400 Subject: [PATCH] Make yum/extract_rpms optional so that apt based systems can use tool --- policycoreutils/sepolicy/sepolicy/generate.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/policycoreutils/sepolicy/sepolicy/generate.py b/policycoreutils/sepolicy/sepolicy/generate.py index 15366c35..6b530354 100644 --- a/policycoreutils/sepolicy/sepolicy/generate.py +++ b/policycoreutils/sepolicy/sepolicy/generate.py @@ -26,7 +26,6 @@ import re import sepolicy from sepolicy import get_all_types, get_all_attributes, get_all_roles import time -import yum from templates import executable from templates import boolean @@ -1252,6 +1251,7 @@ allow %s_t %s_t:%s_socket name_%s; return fcfile def __extract_rpms(self): + import yum yb = yum.YumBase() yb.setCacheDir() @@ -1293,7 +1293,10 @@ allow %s_t %s_t:%s_socket name_%s; self.add_dir(fname) def gen_writeable(self): - self.__extract_rpms() + try: + self.__extract_rpms() + except ImportError: + pass if os.path.isfile("/var/run/%s.pid" % self.name): self.add_file("/var/run/%s.pid" % self.name)