Handle missing PORTDIR in RepoConfigLoader.mainRepo() and the

MaskManager constructor.

diff --git a/pym/portage/package/ebuild/_config/MaskManager.py b/pym/portage/package/ebuild/_config/MaskManager.py
index db94ee5018275d8ad7a1ae590d112650aaa81b01..70ded2dae188f6306c809027fe7edf1cac4f4fa6 100644 (file)
--- a/pym/portage/package/ebuild/_config/MaskManager.py
+++ b/pym/portage/package/ebuild/_config/MaskManager.py
@@ -31,7 +31,10 @@ class MaskManager(object):
                                recursive=1, remember_source_file=True, verify_eapi=True)
                        masters = repo.masters
                        if masters is None:
-                               masters = [repositories.mainRepo()]
+                               masters = []
+                               main_repo = repositories.mainRepo()
+                               if main_repo is not None:
+                                       masters.append(main_repo)
                        for master in masters:
                                master_lines = grabfile_package(os.path.join(master.location, "profiles", "package.mask"), \
                                        recursive=1, remember_source_file=True, verify_eapi=True)

diff --git a/pym/portage/repository/config.py b/pym/portage/repository/config.py
index e79cddb7012fd55f47d04f88986ab422f2e316f9..73cddff426e3064230fea2c7e30c3a3c6eb029ed 100644 (file)
--- a/pym/portage/repository/config.py
+++ b/pym/portage/repository/config.py
@@ -245,7 +245,10 @@ class RepoConfigLoader(object):
 
        def mainRepo(self):
                """Returns the main repo"""
-               return self.prepos[self.prepos['DEFAULT'].main_repo]
+               maid_repo = self.prepos['DEFAULT'].main_repo
+               if maid_repo is None:
+                       return None
+               return self.prepos[maid_repo]
 
        def _check_locations(self):
                """Check if repositories location are correct and show a warning message if not"""