LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

Merge remote-tracking branch 'tswsl1989/brownan'

Browse Source
This commit is contained in:
Aaron Griffith
2011-08-16 11:27:54 -04:00
parent 04310ab71d 46c960b37d
commit e808007b11
1 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
overviewer_core/configParser.py
View File

@@ -78,7 +78,6 @@ class ConfigOptionParser(object):
g = dict() g = dict()
for a in self.configVars: for a in self.configVars:
n = a['dest'] n = a['dest']
if a.get('advanced', False): continue
if a.get('commandLineOnly', False): continue if a.get('commandLineOnly', False): continue
v = getattr(options, n) v = getattr(options, n)
if v != None: if v != None:
@@ -133,7 +132,6 @@ class ConfigOptionParser(object):
# third, merge options into configReslts (with options overwriting anything in configResults) # third, merge options into configReslts (with options overwriting anything in configResults)
for a in self.configVars: for a in self.configVars:
n = a['dest'] n = a['dest']
if a.get('advanced', False): continue
if getattr(options, n) != None: if getattr(options, n) != None:
configResults.__dict__[n] = getattr(options, n) configResults.__dict__[n] = getattr(options, n)