From 2bec0bd353bda9803445764415cef23c5459ac4b Mon Sep 17 00:00:00 2001 From: Mike Khiretskiy Date: Thu, 31 Jul 2014 14:25:52 +0400 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D0=BF=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=BA?= =?UTF-8?q?=D0=B0=20=D0=BD=D0=B0=20emerge.=20=D0=98=D1=81=D0=BF=D1=80?= =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=20=D0=B2=D1=8B=D0=B2=D0=BE=D0=B4?= =?UTF-8?q?.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- update/update.py | 23 ++++++++++++----------- update/wsdl_update.py | 6 +++--- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/update/update.py b/update/update.py index 9144626..053d307 100644 --- a/update/update.py +++ b/update/update.py @@ -136,17 +136,18 @@ class Update: time.sleep(random.random()*3) self.endTask() - emerge_running = lambda: any("/usr/bin/emerge" in x - for x in getRunCommands()) - if emerge_running(): - if not wait_update: - raise UpdateError(_("Emerge is running. " - "Try to run later.")) - else: - self.startTask(_("Waiting for emerge to be complete")) - while emerge_running(): - time.sleep(1) - self.endTask() + if self.clVars.Get('cl_chroot_status') == 'off': + emerge_running = lambda: any("/usr/bin/emerge" in x + for x in getRunCommands(True)) + if emerge_running(): + if not wait_update: + raise UpdateError(_("Emerge is running. " + "Try to run later.")) + else: + self.startTask(_("Waiting for emerge to be complete")) + while emerge_running(): + time.sleep(1) + self.endTask() return True def syncRepositories(self, repname, clean_on_error=True): diff --git a/update/wsdl_update.py b/update/wsdl_update.py index 101ce55..67f2e32 100644 --- a/update/wsdl_update.py +++ b/update/wsdl_update.py @@ -106,9 +106,9 @@ class Wsdl(WsdlBase): # описание груп (список лямбда функций) 'groups': [ lambda group: group(_("Repository"), - brief=('cl_update_profile_repo_name', - ), - hide=("cl_update_profile_rep",), + brief=('cl_update_profile_repo_name',), + hide=('cl_update_profile_rep', + 'cl_update_profile_sync_set'), normal=('cl_update_profile_rep',), expert=('cl_update_profile_branch', 'cl_update_profile_sync_set')),