From 704ee509d3cbcf851db5b997f28bbc128366e810 Mon Sep 17 00:00:00 2001 From: Mike Hiretsky Date: Wed, 15 Dec 2010 10:59:49 +0300 Subject: [PATCH] Add work with binary profile. --- i18n/cl_builder_ru.mo | Bin 13842 -> 13964 bytes pym/cl_builder.py | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/i18n/cl_builder_ru.mo b/i18n/cl_builder_ru.mo index 9d6b44bfe785547d248fd6ab40b6575dd0472fb1..5aefcc54d3bc1dc07f6c886f9d907952a49d825a 100644 GIT binary patch delta 2716 zcmYk-e@smLVa810NF)bJaCx-kzkIIqHZ>_7_-AullFn2%Gq8m~LL zmW0~Zp`NQny{8#ncsST@8*_q+hYKHI7G8C32#XEPC z2;eZrk%kUDih1}CdeBYpW!QxG;RHU6S5e=6Hq+O+7qv8}QT<&(GG&`Ardz{>&8U%` z!~*;tH2{|tnqd)cIoyIj<2v-vsE)c(nSC8K(;HZVE7_46_--tve{+<| zb}n2DUZ7KYt>AnY*5fIx!oN|wwt`;OL7(FoY9JRl+=Bt!gsJ?B@rY?gP3T3`^RuW- z-M|$3H`(MtFDyf)svT)FXHdKQ5^4sKt3sQr9JK^q)QiXP3G}1x%Vj5OKy9dujG*rO z0yXo0k<~G7I<8;kK;J*P&=|;O+DWzx0+7W zXZ#u}bMN6Jcnb%yj5O@Tk8;U>1(jv&ynJj#W#A}2gqM-u3X@J=NrG|XUTi?U;1i^8 zlTMm6&`RVH(~Au_j+)3H_&j>}hVRE2+@R}j@=u#7CNB@-UR1~LV>$kg{5J*UdkeN= z5l-Q&7{KE=#ORd?7kO6dyHP0~MaF2(;1K?ZB*8TD@oU0IY$}gZnMJKt0&mymsKEu; zLd+N4_W;r4T+sbIX7&)8mC7z+5wTn+6iq_qwh+Oi2B1<+*!>(VV!p&s(TueWiOxl> zwX)JpbP-J2L=#$L?Tdv(D$zzPCA3sp7B5jlDAoGH!U$#ie`R!QRK#daRJg7Ev4qev z_Bc0?EE7&-IOmVyW~bhZaYO{s>0EO=irqv9@g$*gfZ!)5Sax!(Ba(OPAH#*VF3lY?-W$zY-apx5iUw zdEBLiC6h%dXJdlrOBJCvSa@Pzmp)t delta 2582 zcmYk+ZA_JA9LMoL9s@Zb&nF(FIK%<;2m%KcIvJ0842e)g(E^l0%+L%}ipD%^%Um06 zj^;uet*QA&S}$-~ZaJG<>qTpAx;7)-7%aC|F35#1deQfH&fV6v^S?j$)43l0*LB^a zhsF+u@1-q0ZImG*m-yagHi08?94LRro8{mbx+G8qovPNaK^tvauM|a6RT@2kQASDuW-P zI&vA6se7pRT%<$K3mqFI?b{wsyf}jD;e_MYs1DpkjrhL$X0;f?KT}0KBLZ#t!PKr3ugCOd9JF3F{s1cmR$8i!h(wnFh&LD%chp7L% zxT%rmqSi_cszW`PfoHJ2=#<6My4GDL`Y{hz;}%?pLs*5AScY?` z1~aH#DPNB(aWAT4?;}4O=TM2CV=2y{29)d}|I}ec^UHR!`4Y(Zu0DC+$)=*2HF6Yt=bJ4#B-=cAJ$_p2Js?3hv6AcloCI+Y{y-wT`-C7;E&jk zZKNZB*RcZUu?`F9#WUE8A^a4z-|suue$t?+89+7oF)CAYxK;Zowyc1L3Q93 zQim<#X7qTYbKQkXaTr_h0&c(sR6}L?(bVonjr0;ejlZHg?qy}_ejD!8{{O(aF^8LY zkVot7xDT808fw+X(yAJ$bnHTPe?%vBtn0zazaE_@NkP#yULm5DS~q@K5;M*J=+lUI;e>^3s1 z_78@&&9WGl8frwna2!?fMI$ZQoq>sxnrJ&*Lx-;#8>cDyo;(JM4oBO&Z9c|1MvbQM+3VPd56a2E8V-=B27D8hvTGb#@ONB~L6-h09Kh4KgzhU7 zM5Q>Jywew}!V&C425+;d5ht_xcVHuGs?LNt(W3YXV^HbTYE{u6|0_&Yp+y?5hgQ!DBA(DnjU_e{H3TKcUgoGxTu2-vmJ^XO<#G4LO^v1AiF22i1_IuS Ts$igc>R9$yNmB<_79{-(dzb60 diff --git a/pym/cl_builder.py b/pym/cl_builder.py index f0bf9c5..f3a50c9 100644 --- a/pym/cl_builder.py +++ b/pym/cl_builder.py @@ -93,6 +93,7 @@ class cl_builder(color_print): self.force = False self.assembleIso = False self.envFile = '/etc/calculate/assemble.env' + self.curProfile = None def setNoColor(self): self.color = False @@ -226,6 +227,37 @@ class cl_builder(color_print): distrPath = distr.convertToDirectory().getDirectory() self.cleanNeedlessKernelData(distrPath) self.applyTemplatesForSquash(distrPath) + # change make.profile + builderPath = self.clVars.Get('cl_builder_path') + curProfileFile = pathJoin(builderPath,"etc/make.profile") + self.curProfile = os.readlink(curProfileFile) + profile = self.clVars.Get('os_builder_profile') + newProfile = None + if not self.curProfile.endswith(profile): + if profile.startswith("calculate"): + newProfile = path.join("../var/lib/layman/calculate/profiles", + profile) + else: + newProfile = path.join("../usr/portage/profiles", + profile) + os.unlink(curProfileFile) + os.symlink(newProfile,curProfileFile) + + + def restoreProfile(self): + """Restore profile""" + if not self.curProfile: + return + self.printMessageForTest(_("Restore system profile")) + builderPath = self.clVars.Get('cl_builder_path') + curProfileFile = pathJoin(builderPath,"etc/make.profile") + profile = self.clVars.Get('os_builder_profile') + newProfile = None + if not self.curProfile.endswith(profile): + os.unlink(curProfileFile) + os.symlink(self.curProfile,curProfileFile) + self.curProfile = None + self.printByResult(True) def isoPrepacking(self,directory): self.printByResult(True) @@ -541,6 +573,7 @@ class cl_builder(color_print): self.printByResult(True) if self.assembleIso: self.restoreMount() + self.restoreProfile() except (BuilderError,DistributiveError),e: error = "%s\n%s" % (str(error),_("Unmounting error")) except KeyboardInterrupt,e: