From a3b75fc2bb1ffe76464d71770f6d21808ae3e076 Mon Sep 17 00:00:00 2001 From: Laurent Bachelier Date: Fri, 27 Jan 2012 23:37:08 +0100 Subject: [PATCH] Use the correct location for sources.list It was moved to the right directory, but Repositories tries to find it in the datadir, not in the workdir. --- weboob/core/ouiboube.py | 3 +-- weboob/core/repositories.py | 11 ++++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/weboob/core/ouiboube.py b/weboob/core/ouiboube.py index 6ac8b852..3295c420 100644 --- a/weboob/core/ouiboube.py +++ b/weboob/core/ouiboube.py @@ -37,7 +37,6 @@ __all__ = ['Weboob'] class Weboob(object): VERSION = '0.a' - WORKDIR = os.path.join(os.path.expanduser('~'), '.weboob') BACKENDS_FILENAME = 'backends' def __init__(self, workdir=None, backends_filename=None, scheduler=None, storage=None): @@ -81,7 +80,7 @@ class Weboob(object): self.create_dir(workdir) # Repositories management - self.repositories = Repositories(datadir, self.VERSION) + self.repositories = Repositories(workdir, datadir, self.VERSION) # Backends loader self.modules_loader = ModulesLoader(self.repositories) diff --git a/weboob/core/repositories.py b/weboob/core/repositories.py index a5ab6346..733b2cd1 100644 --- a/weboob/core/repositories.py +++ b/weboob/core/repositories.py @@ -313,16 +313,17 @@ class Repositories(object): SHARE_DIRS = [MODULES_DIR, REPOSITORIES_DIR, ICONS_DIR] - def __init__(self, workdir, version): + def __init__(self, workdir, datadir, version): self.logger = getLogger('repositories') self.version = version self.workdir = workdir + self.datadir = datadir self.sources_list = os.path.join(self.workdir, self.SOURCES_LIST) - self.modules_dir = os.path.join(self.workdir, self.MODULES_DIR) - self.repos_dir = os.path.join(self.workdir, self.REPOSITORIES_DIR) - self.icons_dir = os.path.join(self.workdir, self.ICONS_DIR) + self.modules_dir = os.path.join(self.datadir, self.MODULES_DIR) + self.repos_dir = os.path.join(self.datadir, self.REPOSITORIES_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.modules_dir) self.create_dir(self.icons_dir)