From 6067a03d77d33decb52a60bceeed0342407a9ccd 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?= <mh@calculate.ru>
Date: Mon, 11 Sep 2017 17:00:46 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A0=D0=B5=D1=84=D0=B0=D0=BA=D1=82=D0=BE?=
 =?UTF-8?q?=D1=80=D0=B8=D0=BD=D0=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* вынос mount функций из utils/files в utils/mount
---
 pym/client/client.py               | 3 ++-
 pym/client/utils/cl_client_sync.py | 2 +-
 pym/client/variables/client.py     | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pym/client/client.py b/pym/client/client.py
index d48723b..14dc66d 100644
--- a/pym/client/client.py
+++ b/pym/client/client.py
@@ -30,9 +30,10 @@ from calculate.lib.cl_ini_parser import iniParser
 from calculate.lib.cl_print import color_print
 from calculate.lib.utils.ip import Pinger, IPError
 from calculate.lib.utils.files import (getModeFile, removeDir,
-                                       isMount, pathJoin, tarLinks,
+                                       pathJoin, tarLinks,
                                        listDirectory, process, find, STDOUT,
                                        sambaPasswordCheck, checkUtils)
+from calculate.lib.utils.mount import isMount
 from calculate.lib.utils.common import cmpVersion
 from calculate.desktop._cl_keys import getKey, clearKey
 from calculate.lib.convertenv import convertEnv
diff --git a/pym/client/utils/cl_client_sync.py b/pym/client/utils/cl_client_sync.py
index ef17e6b..88a348d 100644
--- a/pym/client/utils/cl_client_sync.py
+++ b/pym/client/utils/cl_client_sync.py
@@ -22,7 +22,7 @@ from calculate.lib.utils.files import FilesError
 from calculate.desktop.desktop import DesktopError
 from calculate.client.client import ClientError
 from calculate.lib.cl_template import TemplatesError
-from calculate.lib.utils.files import isMount
+from calculate.lib.utils.mount import isMount
 
 _ = lambda x: x
 setLocalTranslate('cl_client3', sys.modules[__name__])
diff --git a/pym/client/variables/client.py b/pym/client/variables/client.py
index 332c43b..c92f035 100644
--- a/pym/client/variables/client.py
+++ b/pym/client/variables/client.py
@@ -23,8 +23,9 @@ from calculate.lib.datavars import (Variable, VariableError, ReadonlyVariable,
                                     HumanReadable)
 from calculate.lib.cl_ini_parser import iniParser
 from calculate.lib.utils.device import sysfs
-from calculate.lib.utils.files import (isMount, readFile, find,
+from calculate.lib.utils.files import (readFile, find,
                                        FindFileType)
+from calculate.lib.utils.mount import isMount
 from calculate.lib.utils.common import getValueFromCmdLine, CmdlineParams
 from calculate.lib.utils.portage import isPkgInstalled
 from calculate.lib.variables import user