diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-06-13 23:35:14 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-06-13 23:35:14 +0000 |
| commit | d13102fe56b739d836f878ba89f2cd9ac4caa3d5 (patch) | |
| tree | 4c7e0bd7eb1852f06eb1051e737f72990cd89863 /pym/portage/news.py | |
| parent | 3e3bb8306f5abe86988e2ce908435fd81f2af189 (diff) | |
| download | portage-d13102fe56b739d836f878ba89f2cd9ac4caa3d5.tar.gz portage-d13102fe56b739d836f878ba89f2cd9ac4caa3d5.tar.bz2 portage-d13102fe56b739d836f878ba89f2cd9ac4caa3d5.zip | |
Pass existing portdbapi and vardbapi instances into the NewsManager constructor.
svn path=/main/trunk/; revision=6841
Diffstat (limited to 'pym/portage/news.py')
| -rw-r--r-- | pym/portage/news.py | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/pym/portage/news.py b/pym/portage/news.py index 3cfb5de12..028805876 100644 --- a/pym/portage/news.py +++ b/pym/portage/news.py @@ -4,7 +4,6 @@ # $Id$ from portage.const import INCREMENTALS, PROFILE_PATH, NEWS_LIB_PATH -from portage import config, vartree, vardbapi, portdbapi from portage.util import ensure_dirs, apply_permissions from portage.data import portage_gid from portage.locks import lockfile, unlockfile, lockdir, unlockdir @@ -26,17 +25,16 @@ class NewsManager(object): TIMESTAMP_FILE = "news-timestamp" - def __init__(self, root, NEWS_PATH, UNREAD_PATH, LANGUAGE_ID='en'): + def __init__(self, portdb, vardb, NEWS_PATH, UNREAD_PATH, LANGUAGE_ID='en'): self.NEWS_PATH = NEWS_PATH self.UNREAD_PATH = UNREAD_PATH - self.TIMESTAMP_PATH = os.path.join(root, NEWS_LIB_PATH, NewsManager.TIMESTAMP_FILE) - self.target_root = root + self.TIMESTAMP_PATH = os.path.join(vardb.root, + NEWS_LIB_PATH, NewsManager.TIMESTAMP_FILE) + self.target_root = vardb.root self.LANGUAGE_ID = LANGUAGE_ID - self.config = config(config_root = os.environ.get("PORTAGE_CONFIGROOT", "/"), - target_root = root, config_incrementals = INCREMENTALS) - self.vdb = vardbapi(settings = self.config, root = root, - vartree = vartree(root = root, settings = self.config)) - self.portdb = portdbapi(porttree_root = self.config["PORTDIR"], mysettings = self.config) + self.config = vardb.settings + self.vdb = vardb + self.portdb = portdb # Ensure that the unread path exists and is writable. dirmode = 02070 |