From 298398af2be314bb463df0b7a32400bc24f489cc Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Wed, 12 Jun 2019 11:28:20 +0000 Subject: [PATCH] projects.py: Remove dead code Signed-off-by: Jan Lindemann --- scripts/projects.py | 25 ++++--------------------- 1 file changed, 4 insertions(+), 21 deletions(-) diff --git a/scripts/projects.py b/scripts/projects.py index 9caafa12..9ab7980c 100644 --- a/scripts/projects.py +++ b/scripts/projects.py @@ -471,27 +471,10 @@ class Projects(object): else: self.dep_cache[prereq_type] = {} - if True: - r = self.get_modules_from_project_txt([ cur ], ['pkg.requires.jw'], - prereq_type, scope = 2, add_self=False, names_only=True) - self.debug('prerequisites = ' + ' '.join(r)) - else: # legacy from build.py - projects_py = sys.executable + " " + self.my_dir + "/projects.py --prefix " + self.projs_root + " " + os.getenv('PROJECTS_PY_EXTRA_ARGS', "") - cmd = projects_py + " prereq " + prereq_type + " " + cur - self.debug('running', cmd) - p = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE) - p.wait() - if p.returncode: - raise Exception("failed to get " + prereq_type + " prerequisites for " + cur + ": " + cmd) - r = set() - pattern = re.compile(r'.*') # might be useful at a later point, currently pointless - for line in iter(p.stdout.readline, b''): - line = line.decode(sys.stdout.encoding) - self.debug(cmd + ' returned: ', line) - if not pattern.match(line): - continue - for d in line.split(): - r.add(d) + r = self.get_modules_from_project_txt([ cur ], ['pkg.requires.jw'], + prereq_type, scope = 2, add_self=False, names_only=True) + self.debug('prerequisites = ' + ' '.join(r)) + if cur in r: r.remove(cur) self.debug('inserting', prereq_type, "prerequisites of", cur, ":", ' '.join(r))