From 237b5b5188419f5a62f2c1d5f0a7de86b9b9876e Mon Sep 17 00:00:00 2001 From: Mike Hiretsky Date: Tue, 21 Dec 2010 17:16:01 +0300 Subject: [PATCH] Add root param for exists. --- i18n/cl_lib_ru.mo | Bin 25211 -> 25379 bytes pym/cl_template.py | 15 +++++++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/i18n/cl_lib_ru.mo b/i18n/cl_lib_ru.mo index d8cdb4d9e748c01ff7c8a7f980a948eb666769ee..189140cf52fce6ac35954df23b01e423322b27cf 100644 GIT binary patch delta 4885 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 delta 4776 zcmY+{3zSt=83*tU4Dt|%*C+!sz#xKw@_vYez#u{(j)(;UDn3CJA1H(`;6gq?!e?NL zk5CXRA<{upGyye8M8IdJXz5y+;Y!OgF}2n2yXVlVv*v$(`<#34IeUM5pL=2Twt8Q^ zP_OV_tCAJTwpS|U>w{A2QqS=raWz&!c>&MVv8l4|cWf#Ynv90^36&k~x*uXaY8>`sluUhGaqPE#t?KTgcbUs%QHz#dv0>8~{C)W8CW zMN`43zz8isT>#b!xU|S0s{?cx{xX`DJ zH#VtCsS!IeMtUTpqkS1uFpe?usWhGG^4z72*H=^3(_@T|>|%7}1IFU}2jg>vl1?dg z)o9OHbSE%6GMN)On`5|xH7q+kn}P{c#dIyBgLgANw}vr*XE~m)Gdj??cqa(98nl~~^ zznlKjKD$Qo{5Q9vqO@(;o&6aXK8rEu(-;@NnX$+oWX$m{M&14*|XVG7}!EPqkv4{Joa(5ZdQ9OoA7<0IVQPSNU$3HVx^RXV@nEMfoicMtP@M>1^ zb~fT;j8(shah>gqMgBhH`k%277pmt=AQnX#W04%exY0mXv4-)1b7+00Su}U)HrD56 zPUdrrl2c~Z3WhUN<6QRRF2)+D z-#5EqH4Qe+;fY+8pZ_>N-^GXABaLUQ>P0k`w3bnc*I2{PIfeuEei|1t-dFfgV~9rU z0a*{nb6C8ECu1dg?zg>(CUAa(pAl@nz0sd%bVQwXTt1dQ;#HiXOmp}?yIMmNl`n2I zza|^`7Mkua1*vmL@SOdo?4 z?qO8wZ63}xmVB)8YR3C#(DbL}`SDIhCHFHvKV!5)j@Nj2bT*PN8FO4>shYObidC#- z7hamXoKezE`RgBZmg8n7JQnMG##*XlSN?&~@kV2_>kekTZ|+$2j|;DJVliLkwVZO2 z?`ghC>oJ{C>lceF*qQs-jio1NBOS!+9G{;bf5hlu*|==+j%3XJmAr&|s84BV;S~SU z)wqeV*xqGF?q@m6m8XJz*n+h*TWKnz 2: self.printErrTemplate() cl_overriding.exit(1) fileName = terms[0] + flagNotRootFS = True + if len(terms) == 2: + if terms[1] == "root": + flagNotRootFS = False + else: + self.printErrTemplate() + cl_overriding.printERROR(\ + _("Second argument function is not 'root'")) + cl_overriding.exit(1) if fileName[0] == "~": # Получаем директорию пользователя fileName = os.path.join(self.homeDir, @@ -2586,7 +2596,8 @@ class templateFunction(_error, _shareTemplate, _shareTermsFunction): cl_overriding.printERROR(_("wrong path '%s'")%fileName) cl_overriding.exit(1) else: - fileName = pathJoin(self._baseDir, fileName) + if flagNotRootFS: + fileName = pathJoin(self._baseDir, fileName) replace = "" if os.path.exists(fileName): replace = "1"