From bb085d613e6709d552690f71e378437ea635ed07 Mon Sep 17 00:00:00 2001 From: Mike Hiretsky Date: Fri, 25 Mar 2011 17:57:34 +0300 Subject: [PATCH] Fix check ablility run cl-image and cl-kernel command. --- i18n/cl_builder_ru.mo | Bin 14637 -> 14717 bytes pym/cl_fill_builder.py | 18 ++++++++++-------- pym/cl_image_cmd.py | 9 +++++++-- pym/cl_kernel_cmd.py | 1 + 4 files changed, 18 insertions(+), 10 deletions(-) diff --git a/i18n/cl_builder_ru.mo b/i18n/cl_builder_ru.mo index 75acccfe3c6d0d6b80ff9b1ef0a21d376ac3d6cd..ac6e11c1785428dd015eca2979e1ad4bb4e872b0 100644 GIT binary patch delta 2299 zcmXZc4@^~M7{~GF4%7>B3y?nwCKnM&fsj868YW<%L^RZtELf7eMHG=2L=g1Ojgf8E z+|F1nGq;AVMc@cFowe4#t*sI1+-eJ}<(NbpTmQ&qvHJeH=kA{SdCz;^^S;mXyyx8E z;6gC;eSGAA@deaW!7YHTW;yg=?0Y6<`Hw++p|pG~UVi zr&xj4Fb9)j%$DPJOw_UsH2ib~T^-Eid>l3KTetsrOyfMkXBLM==*KE#B6|u8@ffbd zQP(N=`l36+_obrd$;Ei3T}wj~9Kd|+#0-4<{{dzbsLXyqWqcb~;BwN_eFd0~J5kqL zP?bE13gkShVqc-g{o!6uie;S2UZ@7vp&wgO5x(p?f(l>~mH8}c;lFVe#?eW2Z3F7Q zQY^s+)Vu?jfbXFK{~S~CM+~XN3p6xgQoPwR%t4)(p|0=4By4l-M~yp+T5uGV;Z^tg zpQuXs7(~;uk)qjssQGG9m3VR)_18mnk`6^Ygo<<;bMP-zq-*J98?6FK+UighX~HGg zi|eruv+)9M#3?MsII_vZYShBrsCCaIQh)8yhjiSHKcO;;BV9$DkIZ3ZScrQu7hgoa zc99=qv`N&s8@Lf~p-P{d%(mbIsIBTjRp2$(u@DU{Jb}t+9@ksz z1Q)mA43=XS>21NMaVHL
$7z(&aTD*wEW)qC zgQ!1_cd!)a-2V0c@Rl7yEqn%5v1zQsrRm`S8?cD;H&B6GLnV3(cVHq9K)T-lMj9%0 z2y1Z=wcu~4XCsfhRpR}qjE8VD-b6AmKR2s?H}1oi-1BLyaPJCNJk4jf>hnca6f*HkLfy3mY(`kNGvvp3Vagve=v_VxR|m% zh`X^H&tU_uAni)*M7_ozpc4KikNT@r8N8(TV+(3;FQERpW>E|MgUy&hdYbSQDwA1M z0tw7U3|5Nu*n-ON6YR$Y+=_jyUao%BRz!xV+jbg7sFHS}0y&Encmq|^OkVa{tjA4w z9#7+S9KcpORjG*L@H~&BwxAF7EWL@nconI>Jya5|M9NVbd+8WK?PVnC>!B*&?A%^b z<jJa{66mlqIY(uix`~e$Vgs{eFMX zbJJZXx{}`peM82lk0X~O!)JB^r&9UhGZHYn6FR+ zbzccau@N=zb2t~@LIwUY=HLZPs>C;FXu_1B*&NJ8oi9gSkK=rN#B(2N+)Jnhhfx`R z;$8m{Rf%cjYdH+2XjY1vFNUf_>m2H@hpLwjMf?UT(yy@uucIQJPbb@F5hQ7=K~aRWefR4NIGAbj7bQN&{GKVe43arCr zm_WYv4nM?bS*hIio)s8VJyN;i~a7@Ltx zwg0!M<6b(ZFpg2u z&>uz;@58gG{(n(h6%WrWyc<=qlh};kp#m%~FssD9s6gIDWqKa#aT57jga@EV@BaoG zO>`ts3x0uG$j99(aVaX}eq4>GP#N6x`it4GR?fGg#+}4E`~x>&75`=pcm(xOUq#LD zC;BCsXfW#ZY|J)y73Th!uL@(r1EYl<62ap-Ka{vj=JxXcRihVPo<6_vDjwh zaj}EQ5IcsNZ^FAitAzS%p=H#Cs@wC}j_=`SoW+x+r@j-3#S*Bc{e!B&(kOG`!>BC`d_+SJ)9+C?;E!ka(QM<$ z;OKHY{0p3C+#Y}7;vUZZ9C|zy_&$yf4t-i?u-)!yf4*KV>*T2RdiP_{YiHpT?zF!l zvzOLw9E!Eu-I!M49B>EI9(5A#jkGdnuNw;FJ5Rf@K#ud2+s^NkZcm`z*)w`N5X~IT RTDU#ey;d0<9jW}%_aAsN^v(bP diff --git a/pym/cl_fill_builder.py b/pym/cl_fill_builder.py index 9b131cb..1435bf6 100644 --- a/pym/cl_fill_builder.py +++ b/pym/cl_fill_builder.py @@ -156,14 +156,16 @@ class fillVars(object, varsShare): def get_cl_builder_path(self): """Get path for image""" paths = map(lambda x:x[1],reversed(libData.cl_env_data['value'])) - for inifile in paths: - if os.access(inifile,os.R_OK): - inidata = iniParser(inifile) - res = inidata.getVar("assemble","cl_assemble_path", - checkExistVar=True) - if res[0]: - return _toUNICODE(res[1]).encode('utf-8') - return "/mnt/builder" + if self.Get('cl_action') != 'kernel': + for inifile in paths: + if os.access(inifile,os.R_OK): + inidata = iniParser(inifile) + res = inidata.getVar("assemble","cl_assemble_path", + checkExistVar=True) + if res[0]: + return _toUNICODE(res[1]).encode('utf-8') + return "/mnt/builder" + return "/" def get_cl_builder_kernel(self): """Kernel image""" diff --git a/pym/cl_image_cmd.py b/pym/cl_image_cmd.py index cc00376..ded88c5 100644 --- a/pym/cl_image_cmd.py +++ b/pym/cl_image_cmd.py @@ -78,14 +78,15 @@ class image_cmd(share_cmd): def isScratch(self,showError=True): """Detect scartch system""" - if not path.exists(self.envFile) \ + if not os.access(self.envFile,os.R_OK) \ or not self.logicObj.clVars.Get('cl_builder_path'): if self.logicObj.clVars.Get('os_scratch') == 'on': return True else: if showError: self.printERROR( - _("You should load system in the builder mode")) + _("You should load system in the builder mode") + " " + + _("or have to assemble system")) return False return False @@ -128,6 +129,10 @@ class image_cmd(share_cmd): if not self.logicObj.setAssembleData(values.p,values.v): sys.exit(1) + if not self.logicObj.clVars.Get('cl_builder_distro'): + if not self.isRoot() or not self.isScratch(True): + sys.exit(1) + if values.notree: self.logicObj.clVars.Set('cl_builder_tree','off',True) diff --git a/pym/cl_kernel_cmd.py b/pym/cl_kernel_cmd.py index 5c0371b..c5c4c1f 100644 --- a/pym/cl_kernel_cmd.py +++ b/pym/cl_kernel_cmd.py @@ -113,6 +113,7 @@ class kernel_cmd(share_cmd): """Check values all specified options.""" if len(args) > 0: self.optobj.error(_("unrecognized option") + ": %s"% "".join(args)) + self.logicObj.clVars.Set('cl_action',"kernel",True) if values.ebuild: self.checkEnviromentForEbuild() if values.initrd: