From 7246d81aa149a89a608ef607d9c43c9fdd065bc4 Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Tue, 31 Jan 2017 17:34:27 +0100 Subject: [PATCH] Mark dependencies to be skipped even if we skip the packages installation. We have to loop over the dependencies and their packages to know which dependency we may skip. So we must not skip the install_packages step too early. --- kiwix-build.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/kiwix-build.py b/kiwix-build.py index 5a6a24a..24547fd 100755 --- a/kiwix-build.py +++ b/kiwix-build.py @@ -302,10 +302,6 @@ class BuildEnv: def install_packages(self): autoskip_file = pj(self.build_dir, ".install_packages_ok") - if os.path.exists(autoskip_file): - print("SKIP") - return - if self.distname in ('fedora', 'redhat', 'centos'): package_installer = 'dnf' elif self.distname in ('debian', 'ubuntu'): @@ -321,6 +317,9 @@ class BuildEnv: if packages: packages_list += packages dep.skip = True + if os.path.exists(autoskip_file): + print("SKIP") + return if packages_list: command = "sudo {package_installer} install {packages_list}".format( package_installer = package_installer,