From dc4178009e4bcb33d48c665995406dfb8466d0e8 Mon Sep 17 00:00:00 2001 From: Mike khiretskiy Date: Fri, 10 Jan 2014 14:10:24 +0400 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=BD=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B9?= =?UTF-8?q?=D0=BA=D0=B0=20opengl?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- install/install.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/install/install.py b/install/install.py index fdd6b04..c3e0c7e 100644 --- a/install/install.py +++ b/install/install.py @@ -28,7 +28,8 @@ from shutil import copy2 from calculate.core.server.func import safetyWrapper from calculate.lib.utils.files import (runOsCommand,pathJoin, isMount,process,listDirectory,STDOUT, - checkUtils,readFile,find,copyWithPath) + checkUtils,readFile,find,copyWithPath, + readLinesFile) from calculate.lib.utils.common import (appendProgramToEnvFile, removeProgramToEnvFile, getTupleVersion, cmpVersion,getUserPassword, @@ -350,7 +351,7 @@ class Install: newModuleName = defaultGL curModuleName = map(lambda x:x.strip().rpartition('=')[-1].strip('"\''), filter(lambda x: x.startswith("OPENGL_PROFILE="), - readFile(openGLenv))) + readLinesFile(openGLenv))) curModuleName = curModuleName[-1] if curModuleName else "" if curModuleName == newModuleName: return True