Fix a TypeError in DoxyEmitter
There is a problem with 7674543f, in that if HTML_FILE_EXTENSION or MAN_EXTENSION is not specified, we'll try to concatenate a string with None, and get a type error. We should check that they are set before trying to use them.
This commit is contained in:
parent
c876fe0044
commit
0224e8e22a
1 changed files with 2 additions and 2 deletions
|
|
@ -262,7 +262,7 @@ def DoxyEmitter(target, source, env):
|
||||||
if k == 'MAN':
|
if k == 'MAN':
|
||||||
# Is the given extension valid?
|
# Is the given extension valid?
|
||||||
manext = v[3]
|
manext = v[3]
|
||||||
if v[4]:
|
if v[4] and data.has_key(v[4]):
|
||||||
manext = data.get(v[4])
|
manext = data.get(v[4])
|
||||||
# Try to strip off dots
|
# Try to strip off dots
|
||||||
manext = manext.replace('.','')
|
manext = manext.replace('.','')
|
||||||
|
|
@ -284,7 +284,7 @@ def DoxyEmitter(target, source, env):
|
||||||
# Add target files
|
# Add target files
|
||||||
if k != "MAN":
|
if k != "MAN":
|
||||||
# Is an extension override var given?
|
# Is an extension override var given?
|
||||||
if v[4]:
|
if v[4] and data.has_key(v[4]):
|
||||||
fname = v[2]+data.get(v[4])
|
fname = v[2]+data.get(v[4])
|
||||||
else:
|
else:
|
||||||
fname = v[2]+v[3]
|
fname = v[2]+v[3]
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue