From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 7 Oct 2010 21:30:23 +0000 (-0700)
Subject: Make repoman ignore sets.conf.
X-Git-Tag: v2.2_rc91
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c6f7933f0f3aa4b92540fbdbe7135391c2dba246;p=portage.git

Make repoman ignore sets.conf.
---

diff --git a/pym/portage/repository/config.py b/pym/portage/repository/config.py
index fd3eb183b..35ddd140a 100644
--- a/pym/portage/repository/config.py
+++ b/pym/portage/repository/config.py
@@ -460,6 +460,7 @@ class RepoConfigLoader(object):
 def load_repository_config(settings):
 	#~ repoconfigpaths = [os.path.join(settings.global_config_path, "repos.conf")]
 	repoconfigpaths = []
-	repoconfigpaths.append(os.path.join(settings["PORTAGE_CONFIGROOT"],
-		USER_CONFIG_PATH, "repos.conf"))
+	if settings.local_config:
+		repoconfigpaths.append(os.path.join(settings["PORTAGE_CONFIGROOT"],
+			USER_CONFIG_PATH, "repos.conf"))
 	return RepoConfigLoader(repoconfigpaths, settings)