From fe07b305c3152cfb21c9164b3818c735f7ab69ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A5=D0=B8=D1=80=D0=B5=D1=86=D0=BA=D0=B8=D0=B9=20=D0=9C?= =?UTF-8?q?=D0=B8=D1=85=D0=B0=D0=B8=D0=BB?= Date: Tue, 16 Oct 2018 17:50:17 +0300 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=20=D0=B7=D0=B0=D0=BF=D1=83=D1=81=D0=BA=20=D1=83?= =?UTF-8?q?=D1=82=D0=B8=D0=BB=D0=B8=D1=82=20=D0=B2=20readonly=20=D0=A4?= =?UTF-8?q?=D0=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pym/core/server/cl_server.py | 19 +++++++++++-------- pym/core/server/func.py | 1 + pym/core/server/local_call.py | 3 +++ 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/pym/core/server/cl_server.py b/pym/core/server/cl_server.py index baad6db..145b722 100644 --- a/pym/core/server/cl_server.py +++ b/pym/core/server/cl_server.py @@ -113,16 +113,19 @@ def main(*args, **keywords): file_logger.setLevel(logging.DEBUG) # Add the log message handler to the logger - handler = logging.handlers.RotatingFileHandler( - log_filename, maxBytes=10000000, backupCount=3) + try: + handler = logging.handlers.RotatingFileHandler( + log_filename, maxBytes=10000000, backupCount=3) - file_logger.addHandler(handler) + file_logger.addHandler(handler) - # debug - if args.debug: - logging.basicConfig(level=logging.DEBUG) - logger = logging.getLogger('soaplib.wsgi') - logger.setLevel(logging.DEBUG) + # debug + if args.debug: + logging.basicConfig(level=logging.DEBUG) + logger = logging.getLogger('soaplib.wsgi') + logger.setLevel(logging.DEBUG) + except IOError: + pass from urllib2 import URLError diff --git a/pym/core/server/func.py b/pym/core/server/func.py index 1e4139d..9a6152d 100644 --- a/pym/core/server/func.py +++ b/pym/core/server/func.py @@ -626,6 +626,7 @@ class Action(MethodsInterface): self.group_name = "" self.clVars = dv if dv.Get('cl_env_debug_set') == 'off' or \ + dv.Get('cl_root_readonly') == 'on' or \ dv.Get('cl_ebuild_phase') or os.getuid(): logger = StubLogger() else: diff --git a/pym/core/server/local_call.py b/pym/core/server/local_call.py index 8db0d6c..6a714c1 100644 --- a/pym/core/server/local_call.py +++ b/pym/core/server/local_call.py @@ -129,6 +129,9 @@ class LocalCall(object): # пропустить создание файла если идет сборка пакета if self.clVars.Get('cl_ebuild_phase'): return + + if self.clVars.Get('cl_root_readonly') == 'on': + return build_id = "" try: from calculate.builder.variables.action import Actions