x
/
gitdm
Code Issues Proposed changes

Use os.path.join() to prepend the directory name 

...that way we get the right result regardless of whether slashes have been
provided.

Signed-off-by: Jonathan Corbet <corbet@lwn.net>
This commit is contained in:
Jonathan Corbet 2010-07-22 14:43:43 -06:00
parent 6ec7bdaa0f
commit ea23ca50c0
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ConfigFile.py
View File

@ -4,13 +4,13 @@
#
# This code is part of the LWN git data miner.
#
# Copyright 2007-8 LWN.net
# Copyright 2007-8 Jonathan Corbet <corbet@lwn.net>
# Copyright 2007-10 LWN.net
# Copyright 2007-10 Jonathan Corbet <corbet@lwn.net>
#
# This file may be distributed under the terms of the GNU General
# Public License, version 2.
#
import sys, re, datetime
import sys, re, datetime, os.path
import database
#
@ -107,13 +107,13 @@ def ConfigFile (name, confdir):
if len (sline) < 2:
croak ('Funky config line: "%s"' % (line))
if sline[0] == 'EmailAliases':
ReadEmailAliases (confdir + sline[1])
ReadEmailAliases (os.path.join (confdir, sline[1]))
elif sline[0] == 'EmailMap':
ReadEmailEmployers (confdir + sline[1])
ReadEmailEmployers (os.path.join (confdir, sline[1]))
elif sline[0] == 'GroupMap':
if len (sline) != 3:
croak ('Funky group map line "%s"' % (line))
ReadGroupMap (confdir + sline[1], sline[2])
ReadGroupMap (os.path.join (confdir, sline[1]), sline[2])
else:
croak ('Unrecognized config line: "%s"' % (line))
line = ReadConfigLine (file)