* When installing a binary package, export the file name of the package

  as PORTAGE_BINPKG_FILE in order to give bashrc users an opportunity
  to do various things such as remove binary packages after they're
  installed.

* Add a note in ebuild.sh explaining why hardcoded bash lists are
  needed for backward compatibility with <portage-2.1.4 since they
  assume that a newly installed version of ebuild.sh will work for
  pkg_postinst, pkg_prerm, and pkg_postrm when portage is upgrading
  itself.

svn path=/main/trunk/; revision=8878

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index f1d42bd01a56f2befe0c40ad59525a9f79969b76..fbccce70ce32ad8f7c7f1889e113fd865654f898 100755 (executable)
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -1355,12 +1355,17 @@ source_all_bashrcs() {
        [ ! -z "${OCXX}" ] && export CXX="${OCXX}"
 }
 
+# Hardcoded bash lists are needed for backward compatibility with
+# <portage-2.1.4 since they assume that a newly installed version
+# of ebuild.sh will work for pkg_postinst, pkg_prerm, and pkg_postrm
+# when portage is upgrading itself.
+
 READONLY_EBUILD_METADATA="DEPEND DESCRIPTION
        EAPI HOMEPAGE INHERITED IUSE KEYWORDS LICENSE
        PDEPEND PROVIDE RDEPEND RESTRICT SLOT SRC_URI"
 
 READONLY_PORTAGE_VARS="D EBUILD EBUILD_PHASE \
-       EBUILD_SH_ARGS EMERGE_FROM FILESDIR \
+       EBUILD_SH_ARGS EMERGE_FROM FILESDIR PORTAGE_BINPKG_FILE \
        PORTAGE_BIN_PATH PORTAGE_PYM_PATH PORTAGE_MUTABLE_FILTERED_VARS \
        PORTAGE_SAVED_READONLY_VARS PORTAGE_TMPDIR T WORKDIR"
 

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index c5ef5fb04cede7c482d664ce1a877878d824acd5..bbb0c57a0425d0224bcedcb1c1d0a1b42efb812a 100644 (file)
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -875,7 +875,9 @@ class config(object):
                "FEATURES", "FILESDIR", "HOME", "PATH",
                "PKGUSE", "PKG_LOGDIR", "PKG_TMPDIR",
                "PORTAGE_ACTUAL_DISTDIR", "PORTAGE_ARCHLIST",
-               "PORTAGE_BASHRC", "PORTAGE_BINPKG_TMPFILE", "PORTAGE_BIN_PATH",
+               "PORTAGE_BASHRC",
+               "PORTAGE_BINPKG_FILE", "PORTAGE_BINPKG_TMPFILE",
+               "PORTAGE_BIN_PATH",
                "PORTAGE_BUILDDIR", "PORTAGE_COLORMAP",
                "PORTAGE_CONFIGROOT", "PORTAGE_DEBUG", "PORTAGE_DEPCACHEDIR",
                "PORTAGE_GID", "PORTAGE_INST_GID", "PORTAGE_INST_UID",
@@ -5815,6 +5817,10 @@ def pkgmerge(mytbz2, myroot, mysettings, mydbapi=None, vartree=None, prev_mtimes
                fp.write(str(portage.checksum.perform_md5(mytbz2))+"\n")
                fp.close()
 
+               # This gives bashrc users an opportunity to do various things
+               # such as remove binary packages after they're installed.
+               mysettings["PORTAGE_BINPKG_FILE"] = mytbz2
+               mysettings.backup_changes("PORTAGE_BINPKG_FILE")
                debug = mysettings.get("PORTAGE_DEBUG", "") == "1"
 
                # Eventually we'd like to pass in the saved ebuild env here.
@@ -5841,6 +5847,7 @@ def pkgmerge(mytbz2, myroot, mysettings, mydbapi=None, vartree=None, prev_mtimes
                did_merge_phase = True
                return retval
        finally:
+               mysettings.pop("PORTAGE_BINPKG_FILE", None)
                if tbz2_lock:
                        portage.locks.unlockfile(tbz2_lock)
                if builddir_lock: