From d238a632f3cae148e77dd79527be22bfa55a90e6 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 13 Feb 2023 08:59:10 +0300 Subject: [PATCH] =?UTF-8?q?Fix:=20=D1=82=D0=B5=D0=BF=D0=B5=D1=80=D1=8C=20?= =?UTF-8?q?=D0=B8=D0=B4=D0=B5=D1=82=20=D0=BF=D0=BE=D0=BF=D1=8B=D1=82=D0=BA?= =?UTF-8?q?=D0=B0=20=D0=BF=D1=80=D0=B8=D0=BC=D0=BE=D0=BD=D1=82=D0=B8=D1=80?= =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D1=82=D1=8C=20=D0=B2=D1=81=D0=B5=20=D0=B4?= =?UTF-8?q?=D0=BE=D1=81=D1=82=D1=83=D0=BF=D0=BD=D1=8B=D0=B5=20=D1=80=D0=B5?= =?UTF-8?q?=D1=81=D1=83=D1=80=D1=81=D1=8B,=20=D0=BD=D0=B5=D1=81=D0=BC?= =?UTF-8?q?=D0=BE=D1=82=D1=80=D1=8F=20=D0=BD=D0=B0=20=D0=BE=D1=88=D0=B8?= =?UTF-8?q?=D0=B1=D0=BA=D0=B8=20=D0=BC=D0=BE=D0=BD=D1=82=D0=B8=D1=80=D0=BE?= =?UTF-8?q?=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F=20=D0=B2=20=D0=BD=D0=B5=D0=BA?= =?UTF-8?q?=D0=BE=D1=82=D0=BE=D1=80=D1=8B=D1=85=20=D0=B8=D0=B7=20=D0=BD?= =?UTF-8?q?=D0=B8=D1=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pym/client/client.py | 6 ++++-- pym/client/variables/client.py | 17 +++++++++-------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/pym/client/client.py b/pym/client/client.py index f96aedf..d7b1cb3 100644 --- a/pym/client/client.py +++ b/pym/client/client.py @@ -719,8 +719,10 @@ class Client(commandServer, encrypt, Desktop): else: if not self.mountSleepRes(host, userName, userPwd, res, rpath, uid, gid): - raise ClientError( - _("Failed to mount the Samba volume [%s]") % res) + self.printWARNING(_("Failed to mount the Samba volume [%s]") % res) + continue + # raise ClientError( + # _("Failed to mount the Samba volume [%s]") % res) else: return True diff --git a/pym/client/variables/client.py b/pym/client/variables/client.py index d8ff851..4239c01 100644 --- a/pym/client/variables/client.py +++ b/pym/client/variables/client.py @@ -511,15 +511,16 @@ class VariableClClientUserMountData(ReadonlyTableVariable): self.Get('cl_replication_host')) else: yield ("remote_profile", 'unix', '', '') - try: + for host, mount_path in zip(self.Get('cl_share_hosts'), self.Get('cl_share_mounts')): - resource = host.split('/')[-1] - host = host.replace('//', '', 1).split(f"/{resource}")[0] - if mount_path.startswith('~/'): - mount_path = f"{path.join(self.Get('ur_home_path'), mount_path.replace('~/', '', 1))}" - yield (resource, resource, mount_path, host) - except: - raise GeneratorExit + try: + resource = host.split('/')[-1] + host = host.replace('//', '', 1).split(f"/{resource}")[0] + if mount_path.startswith('~/'): + mount_path = f"{path.join(self.Get('ur_home_path'), mount_path.replace('~/', '', 1))}" + yield (resource, resource, mount_path, host) + except: + continue return list(generate())