From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 21 Feb 2010 09:32:15 +0000 (-0000)
Subject: Show a deprecation warning when pkgmerge() is called.
X-Git-Tag: v2.2_rc64~84
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=22476a23f90ac0522ada9970498f24247312918b;p=portage.git

Show a deprecation warning when pkgmerge() is called.

svn path=/main/trunk/; revision=15415
---

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 8b9ee3160..8af1bb4b1 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -8801,6 +8801,10 @@ def pkgmerge(mytbz2, myroot, mysettings, mydbapi=None,
 	"""will merge a .tbz2 file, returning a list of runtime dependencies
 		that must be satisfied, or None if there was a merge error.	This
 		code assumes the package exists."""
+
+	warnings.warn("portage.pkgmerge() is deprecated",
+		DeprecationWarning, stacklevel=2)
+
 	global db
 	if mydbapi is None:
 		mydbapi = db[myroot]["bintree"].dbapi