napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update main.py

Browse Source
This commit is contained in:
Vitor Lopes 2020-06-21 18:03:21 +01:00 committed by GitHub
parent f8db15adc4
commit 75bba349be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/modules/packages/main.py
View File

@ -313,20 +313,31 @@ class PMPacman(PackageManager):
class PMPamac(PackageManager): class PMPamac(PackageManager):
backend = "pamac" backend = "pamac"
def check_db_lock(self, lock="/var/lib/pacman/db.lck"):
# In case some error or crash, the database will be locked,
# resulting in remaining packages not being installed.
import os
if os.path.exists(lock):
check_target_env_call(["rm", lock)
def install(self, pkgs, from_local=False): def install(self, pkgs, from_local=False):
self.check_db_lock()
pamac_flags = "install" pamac_flags = "install"
check_target_env_call([backend, pamac_flags + pkgs) check_target_env_call([backend, pamac_flags, "--no-confirm"] + pkgs)
def remove(self, pkgs): def remove(self, pkgs):
check_target_env_call([backend, "remove"] + pkgs) self.check_db_lock()
check_target_env_call([backend, "remove", "--no-confirm"] + pkgs)
def update_db(self): def update_db(self):
check_target_env_call([backend, "update"]) self.check_db_lock()
check_target_env_call([backend, "update", "--no-confirm"])
def update_system(self): def update_system(self):
check_target_env_call([backend, "upgrade"]) self.check_db_lock()
check_target_env_call([backend, "upgrade", "--no-confirm"])
class PMPortage(PackageManager): class PMPortage(PackageManager):