From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 2 Mar 2010 20:52:10 +0000 (-0000)
Subject: Show a deprecation warning when pkgmerge() is called. (trunk r15415)
X-Git-Tag: v2.1.8~86
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5eff66e2ccd1e1ec65c3588cae695583b249821f;p=portage.git

Show a deprecation warning when pkgmerge() is called. (trunk r15415)

svn path=/main/branches/2.1.7/; revision=15637
---

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 642fd4681..57a15cbb4 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -8798,6 +8798,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