Рефакторинг

* вынос mount функций из utils/files в utils/mount

pym/builder/build_storage.py

@@ -25,8 +25,9 @@ from calculate.install.distr import Distributive
 from calculate.lib.cl_lang import (setLocalTranslate, getLazyLocalTranslate)
 import time
 from calculate.lib.configparser import ConfigParser
-from calculate.lib.utils.files import (readFile, listDirectory, isMount,
+from calculate.lib.utils.files import (readFile, listDirectory,
                                        writeFile)
+from calculate.lib.utils.mount import isMount
 from calculate.lib.utils.git import Git
 from .datavars import BuilderError
 from calculate.lib.utils.tools import Locker, LockError

pym/builder/builder.py

@@ -35,8 +35,9 @@ from calculate.lib.utils.files import (
     makeDirectory, writeFile, readLinesFile, chmod, chown, FilePermission,
     find, FindFileType, removeFileWithEmptyDirectory, check_rw,
     tar_xz_directory, sha256sum,
-    copyWithPath, countFiles, listDirectory, getRunCommands, isMount, readFile,
+    copyWithPath, countFiles, listDirectory, getRunCommands, readFile,
     DirectoryRCS, RCSError)
+from calculate.lib.utils.mount import isMount
 from calculate.lib.utils.git import Git
 from calculate.builder.variables.action import Actions
 from calculate.lib.utils.portage import (Layman, EmergeLog, EmergeLogFiltered,

pym/builder/drive_spool.py

@@ -16,7 +16,7 @@
 
 import sys
 from os import path
-from calculate.lib.utils.files import isMount
+from calculate.lib.utils.mount import isMount
 from calculate.lib.utils.tools import Locker, LockError
 from calculate.lib.cl_lang import (setLocalTranslate, getLazyLocalTranslate)
 import random

pym/builder/utils/cl_builder_restore.py

@@ -18,7 +18,8 @@ import sys
 from calculate.core.server.func import Action, Tasks
 from calculate.lib.cl_lang import setLocalTranslate, getLazyLocalTranslate
 from calculate.lib.cl_template import TemplatesError
-from calculate.lib.utils.files import FilesError, isMount
+from calculate.lib.utils.files import FilesError
+from calculate.lib.utils.mount import isMount
 from ..datavars import BuilderError
 from calculate.lib.utils.git import GitError
 from calculate.install.distr import DistributiveError

pym/builder/variables/builder.py

@@ -30,9 +30,10 @@ import linux as vars_linux
 import datetime
 from calculate.install import distr
 from calculate.lib.utils.device import udev, humanreadableSize
-from calculate.lib.utils.files import (isMount, process, typeFile,
+from calculate.lib.utils.files import (process, typeFile,
                                        listDirectory,
                                        pathJoin, readFile, check_rw)
+from calculate.lib.utils.mount import isMount
 from calculate.lib.utils.kernel import InitrdFile
 from calculate.lib.utils.text import _u8
 from calculate.lib.utils.tools import max_default