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 642fd4681b31d4e097356fc7e4958bd08a0217a5..57a15cbb4905177d3c6ff1f0a0228e3952e82786 100644 (file)
--- 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