janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 12:03:31 +01:00
Code Activity

projects.py: Remove dead code

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2019-06-12 11:28:20 +00:00
commit 298398af2b
1 changed files with 4 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

25
scripts/projects.py
View file

@ -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))