commit: 7e545d52d6cb2b9fb4d5d769f132e37b0c6b0d4b
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 22 20:11:27 2014 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Fri Aug 22 20:11:27 2014 +0000
URL:
http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=7e545d52
Fix porttree_root deprecation warnings
export PYTHONWARNINGS=d to see the warnings that this fixes.
---
pym/_emerge/FakeVartree.py | 4 +++-
pym/_emerge/actions.py | 4 +++-
pym/_emerge/resolver/output_helpers.py | 2 +-
pym/portage/_global_updates.py | 4 +++-
pym/portage/emaint/modules/move/move.py | 5 +++--
pym/portage/news.py | 8 +++++---
pym/portage/tests/dbapi/test_portdb_cache.py | 18 +++++++++---------
pym/portage/tests/glsa/test_security_set.py | 3 ++-
8 files changed, 29 insertions(+), 19 deletions(-)
diff --git a/pym/_emerge/FakeVartree.py b/pym/_emerge/FakeVartree.py
index 14be50c..254f667 100644
--- a/pym/_emerge/FakeVartree.py
+++ b/pym/_emerge/FakeVartree.py
@@ -299,7 +299,9 @@ def grab_global_updates(portdb):
upd_commands.extend(commands)
retupdates[repo_name] = upd_commands
- master_repo = portdb.getRepositoryName(portdb.porttree_root)
+ master_repo = portdb.repositories.mainRepo()
+ if master_repo is not None:
+ master_repo = master_repo.name
if master_repo in retupdates:
retupdates['DEFAULT'] = retupdates[master_repo]
diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py
index 66e18a4..fa04e10 100644
--- a/pym/_emerge/actions.py
+++ b/pym/_emerge/actions.py
@@ -1582,7 +1582,9 @@ def action_info(settings, trees, myopts, myfiles):
myvars = sorted(set(atoms))
- main_repo = portdb.getRepositoryName(portdb.porttree_root)
+ main_repo = portdb.repositories.mainRepo()
+ if main_repo is not None:
+ main_repo = main_repo.name
cp_map = {}
cp_max_len = 0
diff --git a/pym/_emerge/resolver/output_helpers.py
b/pym/_emerge/resolver/output_helpers.py
index e0ee3e0..eb8d97d 100644
--- a/pym/_emerge/resolver/output_helpers.py
+++ b/pym/_emerge/resolver/output_helpers.py
@@ -53,7 +53,7 @@ class _RepoDisplay(object):
# pre-allocate index for PORTDIR so that it always has index 0.
for root_config in roots.values():
portdb = root_config.trees["porttree"].dbapi
- portdir = portdb.porttree_root
+ portdir = portdb.repositories.mainRepoLocation()
if portdir:
self.repoStr(portdir)
diff --git a/pym/portage/_global_updates.py b/pym/portage/_global_updates.py
index dde7268..17dc080 100644
--- a/pym/portage/_global_updates.py
+++ b/pym/portage/_global_updates.py
@@ -118,7 +118,9 @@ def _do_global_updates(trees, prev_mtimes, quiet=False,
if_mtime_changed=True):
else:
bindb = None
- master_repo = portdb.getRepositoryName(portdb.porttree_root)
+ master_repo = portdb.repositories.mainRepo()
+ if master_repo is not None:
+ master_repo = master_repo.name
if master_repo in repo_map:
repo_map['DEFAULT'] = repo_map[master_repo]
diff --git a/pym/portage/emaint/modules/move/move.py
b/pym/portage/emaint/modules/move/move.py
index ef674d4..41ca167 100644
--- a/pym/portage/emaint/modules/move/move.py
+++ b/pym/portage/emaint/modules/move/move.py
@@ -13,8 +13,9 @@ class MoveHandler(object):
self._tree = tree
self._portdb = porttree.dbapi
self._update_keys = Package._dep_keys + ("PROVIDE",)
- self._master_repo = \
-
self._portdb.getRepositoryName(self._portdb.porttree_root)
+ self._master_repo = self._portdb.repositories.mainRepo()
+ if self._master_repo is not None:
+ self._master_repo = self._master_repo.name
def _grab_global_updates(self):
from portage.update import grab_updates, parse_updates
diff --git a/pym/portage/news.py b/pym/portage/news.py
index 408fb5c..0d72b00 100644
--- a/pym/portage/news.py
+++ b/pym/portage/news.py
@@ -61,10 +61,12 @@ class NewsManager(object):
self._dir_mode = 0o0074
self._mode_mask = 0o0000
- portdir = portdb.porttree_root
- profiles_base = os.path.join(portdir, 'profiles') + os.path.sep
+ portdir = portdb.repositories.mainRepoLocation()
+ profiles_base = None
+ if portdir is not None:
+ profiles_base = os.path.join(portdir, 'profiles') +
os.path.sep
profile_path = None
- if portdb.settings.profile_path:
+ if profiles_base is not None and portdb.settings.profile_path:
profile_path = normalize_path(
os.path.realpath(portdb.settings.profile_path))
if profile_path.startswith(profiles_base):
diff --git a/pym/portage/tests/dbapi/test_portdb_cache.py
b/pym/portage/tests/dbapi/test_portdb_cache.py
index 94af96e..3c77ed3 100644
--- a/pym/portage/tests/dbapi/test_portdb_cache.py
+++ b/pym/portage/tests/dbapi/test_portdb_cache.py
@@ -48,7 +48,7 @@ class PortdbCacheTestCase(TestCase):
(lambda: not os.path.exists(md5_cache_dir),),
python_cmd + (textwrap.dedent("""
import os, sys, portage
- if portage.portdb.porttree_root in
portage.portdb._pregen_auxdb:
+ if
portage.portdb.repositories.mainRepoLocation() in portage.portdb._pregen_auxdb:
sys.exit(1)
"""),),
@@ -57,13 +57,13 @@ class PortdbCacheTestCase(TestCase):
(lambda: os.path.exists(md5_cache_dir),),
python_cmd + (textwrap.dedent("""
import os, sys, portage
- if portage.portdb.porttree_root not in
portage.portdb._pregen_auxdb:
+ if
portage.portdb.repositories.mainRepoLocation() not in
portage.portdb._pregen_auxdb:
sys.exit(1)
"""),),
python_cmd + (textwrap.dedent("""
import os, sys, portage
from portage.cache.flat_hash import md5_database
- if not
isinstance(portage.portdb._pregen_auxdb[portage.portdb.porttree_root],
md5_database):
+ if not
isinstance(portage.portdb._pregen_auxdb[portage.portdb.repositories.mainRepoLocation()],
md5_database):
sys.exit(1)
"""),),
@@ -74,13 +74,13 @@ class PortdbCacheTestCase(TestCase):
(lambda: os.path.exists(md5_cache_dir),),
python_cmd + (textwrap.dedent("""
import os, sys, portage
- if portage.portdb.porttree_root not in
portage.portdb._pregen_auxdb:
+ if
portage.portdb.repositories.mainRepoLocation() not in
portage.portdb._pregen_auxdb:
sys.exit(1)
"""),),
python_cmd + (textwrap.dedent("""
import os, sys, portage
from portage.cache.flat_hash import md5_database
- if not
isinstance(portage.portdb._pregen_auxdb[portage.portdb.porttree_root],
md5_database):
+ if not
isinstance(portage.portdb._pregen_auxdb[portage.portdb.repositories.mainRepoLocation()],
md5_database):
sys.exit(1)
"""),),
@@ -91,13 +91,13 @@ class PortdbCacheTestCase(TestCase):
("cache-formats = pms md5-dict",
layout_conf_path,)))),
(portage_python, "-b", "-Wd",
"-Wi::DeprecationWarning", "-c") + (textwrap.dedent("""
import os, sys, portage
- if portage.portdb.porttree_root not in
portage.portdb._pregen_auxdb:
+ if
portage.portdb.repositories.mainRepoLocation() not in
portage.portdb._pregen_auxdb:
sys.exit(1)
"""),),
(portage_python, "-b", "-Wd",
"-Wi::DeprecationWarning", "-c") + (textwrap.dedent("""
import os, sys, portage
from portage.cache.metadata import database as
pms_database
- if not
isinstance(portage.portdb._pregen_auxdb[portage.portdb.porttree_root],
pms_database):
+ if not
isinstance(portage.portdb._pregen_auxdb[portage.portdb.repositories.mainRepoLocation()],
pms_database):
sys.exit(1)
"""),),
@@ -106,13 +106,13 @@ class PortdbCacheTestCase(TestCase):
(BASH_BINARY, "-c", "rm %s" %
portage._shell_quote(layout_conf_path)),
python_cmd + (textwrap.dedent("""
import os, sys, portage
- if portage.portdb.porttree_root not in
portage.portdb._pregen_auxdb:
+ if
portage.portdb.repositories.mainRepoLocation() not in
portage.portdb._pregen_auxdb:
sys.exit(1)
"""),),
python_cmd + (textwrap.dedent("""
import os, sys, portage
from portage.cache.flat_hash import md5_database
- if not
isinstance(portage.portdb._pregen_auxdb[portage.portdb.porttree_root],
md5_database):
+ if not
isinstance(portage.portdb._pregen_auxdb[portage.portdb.repositories.mainRepoLocation()],
md5_database):
sys.exit(1)
"""),),
)
diff --git a/pym/portage/tests/glsa/test_security_set.py
b/pym/portage/tests/glsa/test_security_set.py
index edf5678..bf1f82b 100644
--- a/pym/portage/tests/glsa/test_security_set.py
+++ b/pym/portage/tests/glsa/test_security_set.py
@@ -129,7 +129,8 @@ class SecuritySetTestCase(TestCase):
try:
portdb =
playground.trees[playground.eroot]["porttree"].dbapi
- glsa_dir = os.path.join(portdb.porttree_root,
'metadata', 'glsa')
+ glsa_dir = os.path.join(
+ portdb.repositories.mainRepoLocation(),
'metadata', 'glsa')
portage.util.ensure_dirs(glsa_dir)
for glsa in glsas:
with io.open(os.path.join(glsa_dir,
