gnome-lirc-properties r44 - in trunk: . gnome_lirc_properties

[hadess svn gnome org]

Author: hadess
Date: Tue Jul  1 15:09:07 2008
New Revision: 44
URL: http://svn.gnome.org/viewvc/gnome-lirc-properties?rev=44&view=rev

Log:
2008-07-01  Bastien Nocera  <hadess hadess net>

	* gnome_lirc_properties/backend.py:
	* gnome_lirc_properties/lirc.py: Fix the regexps looking
	for include statements in /etc/lircd.conf, the include syntax
	changed



Modified:
   trunk/ChangeLog
   trunk/gnome_lirc_properties/backend.py
   trunk/gnome_lirc_properties/lirc.py

Modified: trunk/gnome_lirc_properties/backend.py
==============================================================================
--- trunk/gnome_lirc_properties/backend.py	(original)
+++ trunk/gnome_lirc_properties/backend.py	Tue Jul  1 15:09:07 2008
@@ -724,7 +724,7 @@
 
         # find existing include statement:
         include_statement = 'include <%s>\n' % redirect
-        pattern = r'^\s*(#.*)?include\s+%s\s*$' % re.escape(redirect)
+        pattern = r'^\s*(#.*)?include\s+<%s>\s*$' % re.escape(redirect)
         pattern = re.compile(pattern, re.MULTILINE)
         match   = pattern.search(contents)
 

Modified: trunk/gnome_lirc_properties/lirc.py
==============================================================================
--- trunk/gnome_lirc_properties/lirc.py	(original)
+++ trunk/gnome_lirc_properties/lirc.py	Tue Jul  1 15:09:07 2008
@@ -1052,7 +1052,7 @@
         return True
 
     if not re.search(
-        r'^\s*include\s+%s\s*$' % re.escape(config.LIRC_REMOTE_CONF),
+        r'^\s*include\s+<%s>\s*$' % re.escape(config.LIRC_REMOTE_CONF),
         open(config.LIRC_DAEMON_CONF).read(), re.MULTILINE):
         return False