smallsolar
/
kiwix-build
mirror of https://github.com/kiwix/kiwix-build.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Check if packages are installed before trying to install them. 

This avoid to ask to user its (sudo) password if all packages are already
installed.
This commit is contained in:
Matthieu Gautier 2017-02-27 14:17:36 +01:00
parent 759812c41d
commit 843964e55e
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
kiwix-build.py
View File

@ -359,9 +359,11 @@ class BuildEnv:
def install_packages(self): def install_packages(self):
autoskip_file = pj(self.build_dir, ".install_packages_ok") autoskip_file = pj(self.build_dir, ".install_packages_ok")
if self.distname in ('fedora', 'redhat', 'centos'): if self.distname in ('fedora', 'redhat', 'centos'):
package_installer = 'dnf' package_installer = 'sudo dnf install {}'
package_checker = 'rpm -q --quiet {}'
elif self.distname in ('debian', 'Ubuntu'): elif self.distname in ('debian', 'Ubuntu'):
package_installer = 'apt-get' package_installer = 'sudo apt-get install {}'
package_checker = 'LANG=C dpkg -s {} 2>&1 | grep Status | grep "ok installed" 1>/dev/null 2>&1'
mapper_name = "{host}_{target}_{build_type}".format( mapper_name = "{host}_{target}_{build_type}".format(
host=self.distname, host=self.distname,
target=self.build_target, target=self.build_target,
@ -385,11 +387,21 @@ class BuildEnv:
if os.path.exists(autoskip_file): if os.path.exists(autoskip_file):
print("SKIP") print("SKIP")
return return
if packages_list:
command = "sudo {package_installer} install {packages_list}".format( packages_to_install = []
package_installer=package_installer, for package in packages_list:
packages_list=" ".join(packages_list) print(" - {} : ".format(package), end="")
) command = package_checker.format(package)
try:
subprocess.check_call(command, shell=True)
except subprocess.CalledProcessError:
print("NEEDED")
packages_to_install.append(package)
else:
print("SKIP")
if packages_to_install:
command = package_installer.format(" ".join(packages_to_install))
print(command) print(command)
subprocess.check_call(command, shell=True) subprocess.check_call(command, shell=True)
else: else: