Changeset 3539

Timestamp:

Feb 6, 2017, 5:45:00 PM (2 years ago)

Author:

mabarracus

Message:

Fix session detection

File:

• lliurex-detect/trunk/fuentes/lliurex-detect.install/usr/bin/lliurex-detect (modified) (1 diff)

lliurex-detect/trunk/fuentes/lliurex-detect.install/usr/bin/lliurex-detect

@@ -140 +140 @@
         #Attempt to open lts.conf as is more reliable than check environment
             try:
-                for line in open (ltsConfFile):
-                    if line=="LTSP_FATCLIENT":
-                        if "true" in line:
-                            client_type="semi"
-                        else:
-                            if "true" in line:
-                                client_type="thin"
-                            else:
-                                client_type="unknown"
-                        break
-                ltsConfFile.close()
-            except:
+                 re_true=re.compile('LTSP_FATCLIENT(\s)*=(\s)*true',re.IGNORECASE)
+                 re_false=re.compile('LTSP_FATCLIENT(\s)*=(\s)*false',re.IGNORECASE)
+                 with open(ltsConfFile) as ltsfile:
+                      for line in ltsfile.readlines():
+                             if re_true.match(line):
+                                 client_type='semi'
+                                 break
+                             elif re_false.match(line):
+                                 client_type='thin'
+                                 break
+                             else:
+                                 client_type='unknown'
+            except Exception as e:
                 fatclient=os.environ.get('LTSP_FATCLIENT')
                 if fatclient=='true':