From 764cb27eae3b6865025cc72400aa3652fef151c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A1=D0=B0=D0=BC=D0=BE=D1=83=D0=BA=D0=B8=D0=BD=20=D0=90?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
 <asamoukin@asamoukin.local.calculate.ru>
Date: Mon, 5 Apr 2010 10:53:17 +0400
Subject: [PATCH] Bugfix

---
 pym/cl_fill_client.py | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/pym/cl_fill_client.py b/pym/cl_fill_client.py
index 330bb40..fe33535 100644
--- a/pym/cl_fill_client.py
+++ b/pym/cl_fill_client.py
@@ -131,18 +131,22 @@ class fillVars(object, cl_base.glob_attr):
             confLines = open(xorgConfig,"r").readlines()
         except:
             return "off"
-        flagFoundLineComposite = False
         flagStartExtensions = False
+        lineCompositeTmp = ""
         lineComposite = ""
         for line in confLines:
-            if 'Section' in line and '"Extensions"' in line:
-                flagStartExtensions = True
-            if flagStartExtensions and\
-                'Option' in line and '"Composite"' in line:
-                    lineComposite = line
-            if 'EndSection' in line:
-                flagFoundLineComposite = True
-        if flagFoundLineComposite and lineComposite:
+            if flagStartExtensions:
+                if 'EndSection' in line:
+                    lineComposite = lineCompositeTmp
+                    break
+                elif 'Section' in line:
+                    break
+                if 'Option' in line and '"Composite"' in line:
+                    lineCompositeTmp = line
+            else:
+                if '"Extensions"' in line and 'Section' in line:
+                    flagStartExtensions = True
+        if lineComposite:
             listOpt = filter(lambda x: x.strip(), lineComposite.split('"'))
             if len(listOpt) == 3:
                 ret = listOpt[2].lower()