Show More
@@ -1026,6 +1026,16 b' def _readmapfile(mapfile):' | |||||
1026 | raise error.ParseError(_('unmatched quotes'), |
|
1026 | raise error.ParseError(_('unmatched quotes'), | |
1027 | conf.source('', key)) |
|
1027 | conf.source('', key)) | |
1028 | cache[key] = unquotestring(val) |
|
1028 | cache[key] = unquotestring(val) | |
|
1029 | elif key == "__base__": | |||
|
1030 | # treat as a pointer to a base class for this style | |||
|
1031 | path = util.normpath(os.path.join(base, val)) | |||
|
1032 | bcache, btmap = _readmapfile(path) | |||
|
1033 | for k in bcache: | |||
|
1034 | if k not in cache: | |||
|
1035 | cache[k] = bcache[k] | |||
|
1036 | for k in btmap: | |||
|
1037 | if k not in tmap: | |||
|
1038 | tmap[k] = btmap[k] | |||
1029 | else: |
|
1039 | else: | |
1030 | val = 'default', val |
|
1040 | val = 'default', val | |
1031 | if ':' in val[1]: |
|
1041 | if ':' in val[1]: |
General Comments 0
You need to be logged in to leave comments.
Login now