nojhan/weboob-devel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use the correct location for sources.list

Browse source 
It was moved to the right directory, but Repositories tries to find it
in the datadir, not in the workdir.
This commit is contained in:
Laurent Bachelier 2012-01-27 23:37:08 +01:00
commit a3b75fc2bb
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
weboob/core/ouiboube.py
View file

@ -37,7 +37,6 @@ __all__ = ['Weboob']
class Weboob(object): class Weboob(object):
VERSION = '0.a' VERSION = '0.a'
WORKDIR = os.path.join(os.path.expanduser('~'), '.weboob')
BACKENDS_FILENAME = 'backends' BACKENDS_FILENAME = 'backends'
def __init__(self, workdir=None, backends_filename=None, scheduler=None, storage=None): def __init__(self, workdir=None, backends_filename=None, scheduler=None, storage=None):
@ -81,7 +80,7 @@ class Weboob(object):
self.create_dir(workdir) self.create_dir(workdir)
# Repositories management # Repositories management
self.repositories = Repositories(datadir, self.VERSION) self.repositories = Repositories(workdir, datadir, self.VERSION)
# Backends loader # Backends loader
self.modules_loader = ModulesLoader(self.repositories) self.modules_loader = ModulesLoader(self.repositories)

11
weboob/core/repositories.py
View file

@ -313,16 +313,17 @@ class Repositories(object):
SHARE_DIRS = [MODULES_DIR, REPOSITORIES_DIR, ICONS_DIR] SHARE_DIRS = [MODULES_DIR, REPOSITORIES_DIR, ICONS_DIR]
def __init__(self, workdir, version): def __init__(self, workdir, datadir, version):
self.logger = getLogger('repositories') self.logger = getLogger('repositories')
self.version = version self.version = version
self.workdir = workdir self.workdir = workdir
self.datadir = datadir
self.sources_list = os.path.join(self.workdir, self.SOURCES_LIST) self.sources_list = os.path.join(self.workdir, self.SOURCES_LIST)
self.modules_dir = os.path.join(self.workdir, self.MODULES_DIR) self.modules_dir = os.path.join(self.datadir, self.MODULES_DIR)
self.repos_dir = os.path.join(self.workdir, self.REPOSITORIES_DIR) self.repos_dir = os.path.join(self.datadir, self.REPOSITORIES_DIR)
self.icons_dir = os.path.join(self.workdir, self.ICONS_DIR) self.icons_dir = os.path.join(self.datadir, self.ICONS_DIR)
self.create_dir(self.workdir) self.create_dir(self.datadir)
self.create_dir(self.repos_dir) self.create_dir(self.repos_dir)
self.create_dir(self.modules_dir) self.create_dir(self.modules_dir)
self.create_dir(self.icons_dir) self.create_dir(self.icons_dir)