Исправлена проверка на emerge. Исправлен вывод.

master3.3
Mike Khiretskiy 10 years ago
parent d8cbd1c6e8
commit 2bec0bd353

@ -136,17 +136,18 @@ class Update:
time.sleep(random.random()*3) time.sleep(random.random()*3)
self.endTask() self.endTask()
emerge_running = lambda: any("/usr/bin/emerge" in x if self.clVars.Get('cl_chroot_status') == 'off':
for x in getRunCommands()) emerge_running = lambda: any("/usr/bin/emerge" in x
if emerge_running(): for x in getRunCommands(True))
if not wait_update: if emerge_running():
raise UpdateError(_("Emerge is running. " if not wait_update:
"Try to run later.")) raise UpdateError(_("Emerge is running. "
else: "Try to run later."))
self.startTask(_("Waiting for emerge to be complete")) else:
while emerge_running(): self.startTask(_("Waiting for emerge to be complete"))
time.sleep(1) while emerge_running():
self.endTask() time.sleep(1)
self.endTask()
return True return True
def syncRepositories(self, repname, clean_on_error=True): def syncRepositories(self, repname, clean_on_error=True):

@ -106,9 +106,9 @@ class Wsdl(WsdlBase):
# описание груп (список лямбда функций) # описание груп (список лямбда функций)
'groups': [ 'groups': [
lambda group: group(_("Repository"), lambda group: group(_("Repository"),
brief=('cl_update_profile_repo_name', brief=('cl_update_profile_repo_name',),
), hide=('cl_update_profile_rep',
hide=("cl_update_profile_rep",), 'cl_update_profile_sync_set'),
normal=('cl_update_profile_rep',), normal=('cl_update_profile_rep',),
expert=('cl_update_profile_branch', expert=('cl_update_profile_branch',
'cl_update_profile_sync_set')), 'cl_update_profile_sync_set')),

Loading…
Cancel
Save