X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/tripe/blobdiff_plain/f417591ad3bf4cebac5840139f04db3159bcfef3..7dd9d51f463e36e14b61e8d6455e56b9b7e50878:/peerdb/tripe-newpeers.in diff --git a/peerdb/tripe-newpeers.in b/peerdb/tripe-newpeers.in index fdb91708..1213b904 100644 --- a/peerdb/tripe-newpeers.in +++ b/peerdb/tripe-newpeers.in @@ -296,6 +296,9 @@ class ConfigSection (object): ## Special handling for the `name' key. if key == 'name': value = me._itemmap.get('name', me.name) + elif key == '@inherits': + try: return me._itemmap['@inherits'] + except KeyError: raise MissingKeyException(me.name, key) else: value, _ = me._get(key) if value is None: @@ -322,8 +325,7 @@ class ConfigSection (object): if p.name not in visiting: stack.append(p); visiting[p.name] = True - for key in sec._itemmap.iterkeys(): - if key != '@inherit': seen[key] = None + for key in sec._itemmap.iterkeys(): seen[key] = None ## And we're done. return seen.iterkeys()