Исправлена проверка запущенного emerge

legacy27 3.6.7.2
parent 30e4e3e36d
commit 79bc71f3b6

@ -42,6 +42,7 @@ import shutil
from collections import MutableSet from collections import MutableSet
from contextlib import contextmanager from contextlib import contextmanager
import tempfile import tempfile
from fnmatch import fnmatch
from calculate.lib.utils.git import Git, GitError, MTimeKeeper, NotGitError from calculate.lib.utils.git import Git, GitError, MTimeKeeper, NotGitError
from calculate.lib.utils.portage import (ReposConf, EmergeLog, from calculate.lib.utils.portage import (ReposConf, EmergeLog,
@ -317,7 +318,7 @@ class Update(MethodsInterface):
self.endTask() self.endTask()
if self.clVars.Get('cl_chroot_status') == 'off': if self.clVars.Get('cl_chroot_status') == 'off':
emerge_running = lambda: any("/usr/bin/emerge" in x emerge_running = lambda: any(fnmatch(x, "*python-exec/*/emerge*")
for x in getRunCommands(True)) for x in getRunCommands(True))
if emerge_running(): if emerge_running():
if not wait_update: if not wait_update:

Loading…
Cancel
Save