[gentoo-commits] proj/portage:master commit in: pym/portage/package/ebuild/, pym/portage/dbapi/, pym/_emerge/

["Zac Medico" <zmedico@gentoo.org>]

commit:     1d790c4c1526e01e45f27b977fc2eff739be50b8
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 25 21:54:32 2013 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Thu Jul 25 21:54:32 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=1d790c4c

Refer to /etc/portage/make.conf in messages.

---
 pym/_emerge/actions.py              | 2 +-
 pym/portage/dbapi/vartree.py        | 2 +-
 pym/portage/package/ebuild/fetch.py | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py
index c5ee353..03074fe 100644
--- a/pym/_emerge/actions.py
+++ b/pym/_emerge/actions.py
@@ -3555,7 +3555,7 @@ def repo_name_duplicate_check(trees):
 			"All profiles/repo_name entries must be unique in order " + \
 			"to avoid having duplicates ignored. " + \
 			"Set PORTAGE_REPO_DUPLICATE_WARN=\"0\" in " + \
-			"/etc/make.conf if you would like to disable this warning."))
+			"/etc/portage/make.conf if you would like to disable this warning."))
 		msg.append("\n")
 		writemsg_level(''.join('%s\n' % l for l in msg),
 			level=logging.WARNING, noiselevel=-1)

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index bc17a59..fe61229 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -3804,7 +3804,7 @@ class dblink(object):
 					_("Manually run `emerge --unmerge =%s` if you "
 					"really want to remove the above files. Set "
 					"PORTAGE_PACKAGE_EMPTY_ABORT=\"0\" in "
-					"/etc/make.conf if you do not want to "
+					"/etc/portage/make.conf if you do not want to "
 					"abort in cases like this.") % other_dblink.mycpv,
 					wrap_width))
 				eerror(msg)

diff --git a/pym/portage/package/ebuild/fetch.py b/pym/portage/package/ebuild/fetch.py
index fe5c5e3..5316f03 100644
--- a/pym/portage/package/ebuild/fetch.py
+++ b/pym/portage/package/ebuild/fetch.py
@@ -347,7 +347,7 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0,
 				_("!!! For fetching to a read-only filesystem, "
 				"locking should be turned off.\n")), noiselevel=-1)
 			writemsg(_("!!! This can be done by adding -distlocks to "
-				"FEATURES in /etc/make.conf\n"), noiselevel=-1)
+				"FEATURES in /etc/portage/make.conf\n"), noiselevel=-1)
 #			use_locks = 0
 
 	# local mirrors are always added
@@ -752,7 +752,7 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0,
 							"remaining space.\n"), noiselevel=-1)
 						if userfetch:
 							writemsg(_("!!! You may set FEATURES=\"-userfetch\""
-								" in /etc/make.conf in order to fetch with\n"
+								" in /etc/portage/make.conf in order to fetch with\n"
 								"!!! superuser privileges.\n"), noiselevel=-1)
 
 				if fsmirrors and not os.path.exists(myfile_path) and has_space: