From 444ebf0ed277df9af1720016960b16d1a850f27e Mon Sep 17 00:00:00 2001 From: Tom Yan Date: Tue, 26 Mar 2019 20:21:44 +0800 Subject: [PATCH] buildorder.py: make fast build mode download all subpackages --- scripts/buildorder.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/buildorder.py b/scripts/buildorder.py index afc492109..7afb503be 100755 --- a/scripts/buildorder.py +++ b/scripts/buildorder.py @@ -84,6 +84,7 @@ class TermuxPackage(object): subpkg = TermuxSubPackage(self.dir + '/' + filename, self) self.subpkgs.append(subpkg) + self.deps.add(subpkg.name) self.deps |= subpkg.deps if develsplit(build_sh_path): @@ -138,7 +139,8 @@ class TermuxSubPackage: if dependency_name == self.parent.name: self.parent.deps.discard(self.name) dependency_package = pkgs_map[dependency_name] - result += dependency_package.recursive_dependencies(pkgs_map) + if dependency_package not in self.parent.subpkgs: + result += dependency_package.recursive_dependencies(pkgs_map) result += [dependency_package] return unique_everseen(result)