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 8b9ee31608412a59b57e50e1b01b92c22b3537e6..8af1bb4b1d1878d99457ea3805386de6e0e50de6 100644 (file)
--- 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