atratsevskiy
parent f79f698d20
commit b74242378c

@ -14,7 +14,7 @@ AUX calculate-builder-2.2.27-r3.patch 3317 RMD160 6d529c26ea3042534db59f339cf059
AUX calculate-builder-2.2.27-r4.patch 5638 RMD160 549db728ec9c19067814926f9820ea874b484aae SHA1 a18830fedc3ff909166a3e89b9069a95e668eab8 SHA256 f6d7d119f0eae59b0390dd91be389a068c3a7be11f574167c80a7777e14e62bd
AUX calculate-builder-2.2.28-filesnum_dispatch.patch 1924 RMD160 2c91e2285c8d69999ce876a144716675b16aaa6b SHA1 edfbb78ce36ffab0edc12ef3bd426cf9437ad157 SHA256 7260530206dd4dd6c17e7cd07128b02a9d581f7d79a8db867c2766771e09b484
AUX calculate-builder-2.2.28-filesnum_variable.patch 2110 RMD160 72fdfe613d45f8c319424d01b22733358169321d SHA1 b93a345c1f2c21be844a04e8ac617919a4e68a69 SHA256 97e033cf4c62b6a06509e48fbb95011442d156f679a1748dcec893882428ec98
AUX calculate-builder-2.2.28-fix_dispatch.patch 1214 RMD160 cfaa7aed7ce5423f86d64cd4871c0ce3465e5aae SHA1 f93fe264a9c53a0aed5115f4da41323432d4fd84 SHA256 d07f6c259b68fa857b92c0016dc98ce3772ea6569a08ec24309252c3e7951d31
AUX calculate-builder-2.2.28-fix_dispatch.patch 932 RMD160 f50680c9afd8da30daf3ddd7be810400b04f252a SHA1 a9d863a264d2bc6904bf90f5ffc797f6ef1715f0 SHA256 c9079c21e331fe81c3952ea40aba138ffa5940692ad4f36ac76f9d0df1b04375
DIST calculate-builder-2.2.24.tar.bz2 26996 RMD160 b5cdfe057ccb0496ed4c1470570575086c2d58fd SHA1 1b68631826c8499be03b0e3ad1062ccc2c4d9d0f SHA256 8b995b5dbe5a1d9e98178f68720e7a30dfb02829ddf2f63b131786d962bf1c12
DIST calculate-builder-2.2.25.tar.bz2 27120 RMD160 1640be4f5e2ac4971a26f575d85a28c694a88c1d SHA1 c92c128bf5f3ef83a731ae086432aecda06a6ffd SHA256 09d1493afb699113abb55e3646280b72424e5a4c48e83d9a180ef56e4d630c95
DIST calculate-builder-2.2.26.tar.bz2 27348 RMD160 216a169afec92ec9f2e85e9a3d1fe52bce923216 SHA1 e0b5d6fe30065e438b336d5651692110e4151d35 SHA256 35c140fedf963b677b29efce4c0a48a7bc3b9c0ffb02d660ebc302a12c7c01d5

@ -1,21 +1,16 @@
diff --git a/pym/cl_builder.py b/pym/cl_builder.py
index d6477c7..e71cb8f 100644
index d6477c7..69e2257 100644
--- a/pym/cl_builder.py
+++ b/pym/cl_builder.py
@@ -247,6 +247,8 @@ class cl_builder(color_print):
@@ -247,6 +247,7 @@ class cl_builder(color_print):
def prepareSourceDistributive(self,distr):
"""Unmount all bind,proc mount points from source distribute"""
mp = self.clVars.Get('cl_builder_path')
+ distrPath = distr.convertToDirectory().getDirectory()
+ self.dispatchConf(distrPath)
+ self.dispatchConf(mp)
mps = filter(lambda x:x!=mp,map(lambda x:x[1],childMounts(mp)))
for target in sorted(mps, reverse=True):
self.printMessageForTest(_("Unmounting %s")%(target[len(mp):]))
@@ -254,11 +256,9 @@ class cl_builder(color_print):
if umountProcess.failed():
raise BuilderError(_("Failed to unmount %s")%target)
self.printByResult(True)
- distrPath = distr.convertToDirectory().getDirectory()
@@ -258,7 +259,6 @@ class cl_builder(color_print):
self.clVars.Set('cl_builder_squash_path',
os.path.basename(os.path.normpath(distrPath)))
self.cleanNeedlessKernelData(distrPath)

Loading…
Cancel
Save