Skip to content

Commit

Permalink
libdeng2: Cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
skyjake committed Dec 3, 2012
1 parent 293c04e commit b4e632b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 10 deletions.
2 changes: 1 addition & 1 deletion doomsday/libdeng2/modules/Config.de
Expand Up @@ -76,9 +76,9 @@ def setDefaults(d = None)
end

def updateWithDefaults()
# Any values not already in Config are copied from defaults.
record defaults
setDefaults(defaults)
# Anything that is not already in Config should be added.
import recutil, Config
recutil.copyMissingMembers(defaults, Config)
end
Expand Down
11 changes: 2 additions & 9 deletions doomsday/libdeng2/modules/recutil.de
Expand Up @@ -24,21 +24,14 @@ def copyMissingMembers(src, dest)
# the missing members to 'dest'. Private keys in 'src' are ignored.
# - src: Source record.
# - dest: Destination record.
print "inserting missing members"

for name in dictkeys(members(src))
# Private members should be ignored.
if name[:2] == "__": continue

print "Checking member", name
if not name in members(dest)
if name in subrecords(src)
print "=> adding subrecord", name
dest[name] = Record()
else
print "=> setting member", name, "=", src[name]
dest[name] = src[name]
end
if name in subrecords(src): dest[name] = Record()
else: dest[name] = src[name]
end

if name in subrecords(src): copyMissingMembers(src[name], dest[name])
Expand Down

0 comments on commit b4e632b

Please sign in to comment.