RepoMirrors
/
nvchecker
mirror of https://github.com/lilydjwg/nvchecker
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

make keyfile path relative to the config file

This commit is contained in:
lilydjwg 2018-05-05 23:44:35 +08:00
parent d0a197115c
commit a73314dc64
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nvchecker/core.py
View File

@ -114,17 +114,19 @@ class Source:
if '__config__' in config: if '__config__' in config:
c = config['__config__'] c = config['__config__']
d = os.path.dirname(file.name)
if 'oldver' in c and 'newver' in c: if 'oldver' in c and 'newver' in c:
d = os.path.dirname(file.name)
self.oldver = os.path.expandvars(os.path.expanduser( self.oldver = os.path.expandvars(os.path.expanduser(
os.path.join(d, c.get('oldver')))) os.path.join(d, c.get('oldver'))))
self.newver = os.path.expandvars(os.path.expanduser( self.newver = os.path.expandvars(os.path.expanduser(
os.path.join(d, c.get('newver')))) os.path.join(d, c.get('newver'))))
self.max_concurrent = c.getint('max_concurrent', 20)
keyfile = c.get('keyfile') keyfile = c.get('keyfile')
if keyfile: if keyfile:
keyfile = os.path.expanduser(keyfile) keyfile = os.path.expandvars(os.path.expanduser(
os.path.join(d, c.get('keyfile'))))
self.max_concurrent = c.getint('max_concurrent', 20)
self.keymanager = KeyManager(keyfile) self.keymanager = KeyManager(keyfile)
session.nv_config = config["__config__"] session.nv_config = config["__config__"]