diff options
author | Brian Dolbec <dolsen@gentoo.org> | 2012-10-14 18:03:27 -0700 |
---|---|---|
committer | Brian Dolbec <dolsen@gentoo.org> | 2012-10-14 19:21:23 -0700 |
commit | 92a545dc6b64bbebfa9bc4c3788f1ae3db058788 (patch) | |
tree | 28ad00e9d3cc9668340b220e7dd8ab06af1ad982 /layman/updater.py | |
parent | e13bca9defe7d7dce41757cf414c4ad8ac5a7e8c (diff) | |
download | layman-92a545dc6b64bbebfa9bc4c3788f1ae3db058788.tar.gz layman-92a545dc6b64bbebfa9bc4c3788f1ae3db058788.tar.bz2 layman-92a545dc6b64bbebfa9bc4c3788f1ae3db058788.zip |
Add checking for ROOT in the environment on statup, and setting it in the appropriate paths.
Add warnings for not finding the config file and installed db. Fix updaters config file path
Diffstat (limited to 'layman/updater.py')
-rw-r--r-- | layman/updater.py | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/layman/updater.py b/layman/updater.py index 1ee7345..746a061 100644 --- a/layman/updater.py +++ b/layman/updater.py @@ -36,11 +36,12 @@ def rename_db(config, newname, output): class Main(object): - def __init__(self): + def __init__(self, root=None): self.parser = None self.output = None self.config = None self.args = None + self.root = root def args_parser(self): self.parser = argparse.ArgumentParser(prog='layman-updater', @@ -59,8 +60,14 @@ class Main(object): 'config': self.args.config, } - self.config = OptionConfig(options=options) - self.config.read_config(self.config.get_defaults()) + self.config = OptionConfig(options=options, root=self.root) + # fix the config path + defaults = self.config.get_defaults() + defaults['config'] = defaults['config'] \ + % {'configdir': defaults['configdir']} + self.config.update_defaults({'config': defaults['config']}) + + self.config.read_config(defaults) layman_inst = LaymanAPI(config=self.config) |