equal
deleted
inserted
replaced
306 u = cls() |
306 u = cls() |
307 # we always trust global config files and environment variables |
307 # we always trust global config files and environment variables |
308 for t, f in rcutil.rccomponents(): |
308 for t, f in rcutil.rccomponents(): |
309 if t == b'path': |
309 if t == b'path': |
310 u.readconfig(f, trust=True) |
310 u.readconfig(f, trust=True) |
|
311 elif t == b'resource': |
|
312 u.read_resource_config(f, trust=True) |
311 elif t == b'items': |
313 elif t == b'items': |
312 sections = set() |
314 sections = set() |
313 for section, name, value, source in f: |
315 for section, name, value, source in f: |
314 # do not set u._ocfg |
316 # do not set u._ocfg |
315 # XXX clean this up once immutable config object is a thing |
317 # XXX clean this up once immutable config object is a thing |