From 947f5d7df924e3850339921d623b9fe03047fa89 Mon Sep 17 00:00:00 2001
From: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
Date: Wed, 19 Dec 2012 04:56:59 +0100
Subject: Rename a private module in preparation for extending its
 functionality.

---
 pym/portage/package/ebuild/_eapi_invalid.py     | 41 -------------------------
 pym/portage/package/ebuild/_metadata_invalid.py | 41 +++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 41 deletions(-)
 delete mode 100644 pym/portage/package/ebuild/_eapi_invalid.py
 create mode 100644 pym/portage/package/ebuild/_metadata_invalid.py

(limited to 'pym/portage/package')

diff --git a/pym/portage/package/ebuild/_eapi_invalid.py b/pym/portage/package/ebuild/_eapi_invalid.py
deleted file mode 100644
index bcf1f7fcd..000000000
--- a/pym/portage/package/ebuild/_eapi_invalid.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-import textwrap
-
-import portage
-from portage.dep import _repo_separator
-from portage.elog import elog_process
-from portage.elog.messages import eerror
-
-def eapi_invalid(self, cpv, repo_name, settings,
-	eapi_var, eapi_parsed, eapi_lineno):
-
-	msg = []
-	msg.extend(textwrap.wrap(("EAPI assignment in ebuild '%s%s%s' does not"
-		" conform with PMS section 7.3.1 (see bug #402167):") %
-		(cpv, _repo_separator, repo_name), 70))
-
-	if not eapi_parsed:
-		# None means the assignment was not found, while an
-		# empty string indicates an (invalid) empty assingment.
-		msg.append(
-			"\tvalid EAPI assignment must"
-			" occur on or before line: %s" %
-			eapi_lineno)
-	else:
-		msg.append(("\tbash returned EAPI '%s' which does not match "
-			"assignment on line: %s") %
-			(eapi_var, eapi_lineno))
-
-	if portage.data.secpass >= 2:
-		# TODO: improve elog permission error handling (bug #416231)
-		for line in msg:
-			eerror(line, phase="other", key=cpv)
-		elog_process(cpv, settings,
-			phasefilter=("other",))
-
-	else:
-		out = portage.output.EOutput()
-		for line in msg:
-			out.eerror(line)
diff --git a/pym/portage/package/ebuild/_metadata_invalid.py b/pym/portage/package/ebuild/_metadata_invalid.py
new file mode 100644
index 000000000..bcf1f7fcd
--- /dev/null
+++ b/pym/portage/package/ebuild/_metadata_invalid.py
@@ -0,0 +1,41 @@
+# Copyright 2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+import textwrap
+
+import portage
+from portage.dep import _repo_separator
+from portage.elog import elog_process
+from portage.elog.messages import eerror
+
+def eapi_invalid(self, cpv, repo_name, settings,
+	eapi_var, eapi_parsed, eapi_lineno):
+
+	msg = []
+	msg.extend(textwrap.wrap(("EAPI assignment in ebuild '%s%s%s' does not"
+		" conform with PMS section 7.3.1 (see bug #402167):") %
+		(cpv, _repo_separator, repo_name), 70))
+
+	if not eapi_parsed:
+		# None means the assignment was not found, while an
+		# empty string indicates an (invalid) empty assingment.
+		msg.append(
+			"\tvalid EAPI assignment must"
+			" occur on or before line: %s" %
+			eapi_lineno)
+	else:
+		msg.append(("\tbash returned EAPI '%s' which does not match "
+			"assignment on line: %s") %
+			(eapi_var, eapi_lineno))
+
+	if portage.data.secpass >= 2:
+		# TODO: improve elog permission error handling (bug #416231)
+		for line in msg:
+			eerror(line, phase="other", key=cpv)
+		elog_process(cpv, settings,
+			phasefilter=("other",))
+
+	else:
+		out = portage.output.EOutput()
+		for line in msg:
+			out.eerror(line)
-- 
cgit v1.2.3-1-g7c22