[gnue] r9836 - trunk/gnue-common/src/base

[reinhard]

Author: reinhard
Date: 2007-11-27 03:44:25 -0600 (Tue, 27 Nov 2007)
New Revision: 9836

Modified:
   trunk/gnue-common/src/base/utils.py
Log:
Fixed use of reserved word.


Modified: trunk/gnue-common/src/base/utils.py
===================================================================
--- trunk/gnue-common/src/base/utils.py 2007-11-27 09:42:02 UTC (rev 9835)
+++ trunk/gnue-common/src/base/utils.py 2007-11-27 09:44:25 UTC (rev 9836)
@@ -71,11 +71,11 @@
     files.append(os.path.join(paths.config, name + '.conf'))
 
     # 2. system configuration directory (usually /etc/gnue/*.d/)
-    dir = os.path.join(paths.config, name + '.d')
-    if os.path.isdir(dir):
-        indir = os.listdir(dir)
+    confdir = os.path.join(paths.config, name + '.d')
+    if os.path.isdir(confdir):
+        indir = os.listdir(confdir)
         indir.sort()
-        files.extend([os.path.join(dir, f) for f in indir])
+        files.extend([os.path.join(confdir, f) for f in indir])
 
     # 3. user configuration (~/.gnue/*.conf)
     if os.environ.has_key('HOME'):