From 04f1d0491d758b3d6ee6d908207d3414019f89d4 Mon Sep 17 00:00:00 2001
From: asamoukin <asamoukin@c91db197-33c1-4113-bf15-f8a5c547ca64>
Date: Mon, 8 Dec 2008 13:15:56 +0000
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B0=20?=
 =?UTF-8?q?=D1=81=20=D0=BF=D1=80=D0=BE=D1=84=D0=B8=D0=BB=D0=B5=D0=BC=20.mo?=
 =?UTF-8?q?zilla/plugins/npwrapper.libflashplayer.so?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://svn.calculate.ru/calculate2/calculate-lib/trunk@661 c91db197-33c1-4113-bf15-f8a5c547ca64
---
 pym/cl_profile.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pym/cl_profile.py b/pym/cl_profile.py
index 8aca8a0..431f505 100644
--- a/pym/cl_profile.py
+++ b/pym/cl_profile.py
@@ -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,