Исправлена ошибка с профилем .mozilla/plugins/npwrapper.libflashplayer.so

git-svn-id: http://svn.calculate.ru/calculate2/calculate-lib/trunk@661 c91db197-33c1-4113-bf15-f8a5c547ca64
master
asamoukin 16 years ago
parent f41a5818b2
commit 04f1d0491d

@ -2411,10 +2411,6 @@ class profile(_file, _terms):
self.setError(\
_("Can not decode file in UTF-8:") + " " + newFile)
return False
if not self.fileIsUtf(oldFile):
self.setError(\
_("Can not decode file in UTF-8:") + " " + oldFile)
return False
# Вычисляем условные блоки
self.newProfile = self.applyTermsProfile(self.newProfile,
newFile)
@ -2430,6 +2426,12 @@ class profile(_file, _terms):
copyFile)
if not objHeadNew:
return filesApply
if not (objHeadNew.params.has_key("link") and\
objHeadNew.params.has_key("symbolic")):
if not self.fileIsUtf(oldFile):
self.setError(\
_("Can not decode file in UTF-8:") + " " + oldFile)
return False
self.newProfile = objHeadNew.body
#if objHeadNew.fileType != "bin":
#self.newProfile = self.applyTermsProfile(self.newProfile,

Loading…
Cancel
Save