From 9f99932d052715e17685437f192fe53cb79d01c7 Mon Sep 17 00:00:00 2001 From: Mike Hiretsky Date: Tue, 12 Apr 2011 15:24:04 +0400 Subject: [PATCH] Fix clt templates with exec param. --- i18n/cl_install_ru.mo | Bin 24200 -> 24290 bytes pym/cl_apply_template.py | 7 ++++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/i18n/cl_install_ru.mo b/i18n/cl_install_ru.mo index 260767de570f6bc4242329060bc4f9e347182671..ac2f2f92bbab427a13273a1a105b2fe936807fc8 100644 GIT binary patch delta 5094 zcmY+|dtBA^9mnwxf{AH}R|FIe;SKSIC}`*;b)se_V%|{@NlDB~ykefj=JE#OWl8F? zvZ-a}{YJ;s*3vXROwDFZr!;7f*7j)bAL)_p^*+C!oBKU@pXc}cJHPY$UVlG(^r|oD zwlBzgqglu%3FC1xdd$4`GKJQhcoRF|2~5CSs2eqEX-3i7qJG#D)uFMdJ{Dj*T!@e2 zHjKkl=)v2ljt29Qj!~%JO~OXBZ_iTT&*t;NwYC-`@NL&hR0l32fA%dOYT####5gWy zkd}t}-BWxd;S5Z{3e@lX=)qdlfJ6C+q$^l-irz0#6&!C36?*0Zq-_2*Fc*@E6q6i!m$w^oa3sNOsT{g6{O2peLyTc3ei z(`Cq?t>r^Aw9BpgP`~>Ud*HuN1Bz!fYG)v7#wJBG|GLo}PH0MtF&Vd^eprR-NIiC@ z8fb``p%@IsMAV+><$gaNwS==#4J}97wyl_kM^O#mLEW!GTjpPztPNXRH|~agFby?z zMW{90=$=21y{LyU9BsP3sHvWU8sQv1xWr0P1KNX+;YHM@ZOBbEpf;!h#Cs`pqtFGr z<0RMBs18-4Ex_fx7S->PCOZju^_YwE23VMw)?oT=P+Tq|7~Efx6F8R6|#gjc+xmCAo*( z*K3h%MUAL8YHfz1Zaf+F!^OxTZ4HLt9@I$o;|M&1dT%sgBQVRBg6iL*bRopI|oQLor) z^k5jh8;#vjOICtf>I&4JIDlRcg){DnYE%#Jxb?73P6uL;zF87#X2zjjp@pa=D@Jv^ z4E5Y^M>TK)wG^MB22z6_yo>5cR08v_6Upo#IR@3hJfsh{3PbP!YL_3yhw)>qhZj)| zRiS3+mRr{}q)-n>t#t-!%BP~9s+Uk5UDcWSR}Xh^LTh{qJ@^f3Ch8|TkEI9I;3(9l z%tDPkAGLQDp*nsD^_ZSRJ)SplVUXGPs2O;stFuIlP>=l%F9l8QWz+?CQ8#MLx7{%g ze~FpMtl4Wg3QyqxY|2I2JDHe-t1$QhcmEQNFS^Wr(h-OdT$h;+H50GZ@xLG z5$(b(tj6J(+SA$nC0IiJFmey;lk9Y?0QLLz$QbNArs7@X7M9e@c~9h_IMs#d7_SX4)6VFc~lb_$xZW2iN*L3N->f9JxHsD_rKMsNYu;U7^m63@kQ5UQhj zI2O0z82mRz;jjTtJJV5{eLZ?xQ#e8)9WS9aV>lI-*HVyER)CM=ZY;*{kavvD;G`@? zUV?TQo8fiL!|#!{Eps5Rb6kgoI*&OxaS-#b3n~XWo1+fXska;K^e`XwN?wUMc*Lzo z@JMI|24g4|;&_~g6Y!#IClr9x@2~ z!2SLQY)ic*>!GzyMlD?)GAJv@#&`ug;w_BDhU`Rb)&zVCvr+eX-%CM{$9d$>e&Rzn z$l#gN`7x*ttiYCd7NhY7>hY^XCe0F`aF%WkCQ{#o8pvsk!|)N#bv;q{pO5X)yPQHf zh26-kSlW}$^Iw8IdFDfnm!JsgKYPdjTm0V}9)Ma@JC7pp^4(1T@2-)$di zW`g*!zVC>df$f zj@tFveCR$$F$QlTmj+&U55a_q&I>IE!>BJtufAAGK|NZB+Du1K4c8%kvMAP}C%%X& z_zr6KevN5Zhgy;p=3i@HjOq9(reY`?gY9GKs2MKBNG#80{<~3lj}r^=I_iCpHO1M* z>rpdu5`(Y-`5n25bolRQXG)vME^>fOBdtjd*+@PjjY&UphI~az$uY8n1ls3?7x>TW zSiC@Vv~vi2F5okq%p!wHExAdCk`nSdxk@Gx9p8{%WHFgTwvy�{M*Sc+SBac<29~ zN(Sjqc9K1$Er}yKJ|}-9O;zDINS2Un(uoui9p@bE4czON#V6ztNh9x)(c};0e>)>k z;eWB<7jF4JAr!WedSu-FllUf?OQJ|J`I_ih>Ja#Ez~PiTl4r^DpD)ZU%J;ON>sgRH*OR|6KW|=9{`3w1jBk1HT>PQV9{(=? iKL37yrT?Vgr>p!2s#g0yqE_km`49Vj2bYX&9R43Y6*X-D delta 5013 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 diff --git a/pym/cl_apply_template.py b/pym/cl_apply_template.py index f8125a1..c92368f 100644 --- a/pym/cl_apply_template.py +++ b/pym/cl_apply_template.py @@ -112,7 +112,12 @@ subdirectories %s")%', '.join(dirsTemplates)) self.printERROR(errMess) return False if nameFile is True: - self.printWARNING(_("Template %s not applied")%cltTemplatePath) + if clTempl.executedFiles: + self.printWARNING(_("Template %s was executed") + %cltTemplatePath) + else: + self.printWARNING(_("Template %s not applied") + %cltTemplatePath) else: self.printWARNING(_("Package %s has changed files")%calcPkg+":") self.printWARNING(" "*5 + nameFile)