Merged from trunk 8627:8640

   | 8628    | Add support for persistence of colon separated               |
   | zmedico | SANDBOX_{DENY,READ,PREDICT,WRITE} variables between phases   |
   |         | so things like the global scope addpredict() call in         |
   |         | qt3.eclass will continue to work.                            |

   | 8629    | Filter _E_DOCDESTTREE_ and _E_EXEDESTTREE_ from              |
   | zmedico | environment.bz2.                                             |

   | 8630    | In the grep expression that's generated in                   |
   | zmedico | filter_readonly_variables(), condense redundant identical    |
   |         | expressions into a single one.                               |

   | 8634    | Fix the var_grep variable in filter_readonly_variables() so  |
   | zmedico | that it's properly local.                                    |

   | 8636    | Unconditionally filter some of the SANDBOX_* variables from  |
   | zmedico | the environment in order to avoid potential interference     |
   |         | problems. For example, having an invalid value for           |
   |         | SANDBOX_LOG prevents the sandbox from killing the ebuild     |
   |         | when a violation occurs.                                     |

   | 8638    | When binarytree.populate() finds missing metadata, specify   |
   | zmedico | which keys are missing so that the user has a clue about     |
   |         | what is wrong.                                               |

   | 8640    | Fix quoting to work properly with eval.                      |
   | zmedico |                                                              |

svn path=/main/branches/prefix/; revision=8642

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index f9d5cf39ea54a101ff9ff7ca10ab045c37a1304b..cd68edc5788e51927964082fb721e01047c3d5f4 100755 (executable)
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -1010,9 +1010,8 @@ dyn_install() {
                # are no longer needed after src_install(). Don't cleanse from
                # the global environment though, in case the user wants to repeat
                # this phase (like with FEATURES=noauto and the ebuild command).
-               unset S
-       
-               save_ebuild_env > environment
+               unset S _E_DOCDESTTREE_ _E_EXEDESTTREE_
+               save_ebuild_env | filter_readonly_variables --filter-sandbox > environment
        )
        bzip2 -f9 environment
 
@@ -1386,25 +1385,39 @@ READONLY_PORTAGE_VARS="D EBUILD EBUILD_PHASE EBUILD_SH_ARGS FILESDIR \
        PORTAGE_BIN_PATH PORTAGE_PYM_PATH PORTAGE_TMPDIR T WORKDIR"
 
 # @FUNCTION: filter_readonly_variables
-# @DESCRIPTION:
+# @DESCRIPTION: [--filter-sandbox]
 # Read an environment from stdin and echo to stdout while filtering readonly
 # variables.
 #
+# --filter-sandbox causes all SANDBOX_* variables to be filtered, which
+# is only desired in certain cases, such as during preprocessing or when
+# saving environment.bz2 for a binary or installed package.
+#
 # In bash-3.2_p20+ an attempt to assign BASH_*, FUNCNAME, GROUPS or any
 # readonly variable cause the shell to exit while executing the "source"
 # builtin command. To avoid this problem, this function filters those
 # variables out and discards them. See bug #190128.
 filter_readonly_variables() {
-       local x var_grep=""
-       for x in BASH SANDBOX ; do
-               var_grep="${var_grep}|(^|^declare[[:space:]]+-[^[:space:]]+[[:space:]]+)${x}_[_[:alnum:]]*=.*"
-       done
+       local x filtered_vars var_grep
        local readonly_bash_vars="DIRSTACK EUID FUNCNAME GROUPS
                PIPESTATUS PPID SHELLOPTS UID"
-       for x in ${readonly_bash_vars} ${READONLY_PORTAGE_VARS} ; do
-               var_grep="${var_grep}|(^|^declare[[:space:]]+-[^[:space:]]+[[:space:]]+)${x}=.*"
+       local filtered_sandbox_vars="SANDBOX_ACTIVE SANDBOX_BASHRC
+               SANDBOX_DEBUG_LOG SANDBOX_DISABLED SANDBOX_LIB
+               SANDBOX_LOG"
+       filtered_vars="${readonly_bash_vars} ${READONLY_PORTAGE_VARS}
+               BASH_[_[:alnum:]]*"
+       if hasq --filter-sandbox $* ; then
+               filtered_vars="${filtered_vars} SANDBOX_[_[:alnum:]]*"
+       else
+               filtered_vars="${filtered_vars} ${filtered_sandbox_vars}"
+       fi
+       set -f
+       for x in ${filtered_vars} ; do
+               var_grep="${var_grep}|${x}"
        done
+       set +f
        var_grep=${var_grep:1} # strip the first |
+       var_grep="(^|^declare[[:space:]]+-[^[:space:]]+[[:space:]]+)(${var_grep})=.*"
        # The sed is to remove the readonly attribute from variables such as those
        # listed in READONLY_EBUILD_METADATA, since having any readonly attributes
        # persisting in the saved environment can be inconvenient when it
@@ -1422,13 +1435,14 @@ filter_readonly_variables() {
 # interfering with the current environment. This is useful when an existing
 # environment needs to be loaded from a binary or installed package.
 preprocess_ebuild_env() {
-       filter_readonly_variables < "${T}"/environment > "${T}"/environment.filtered
+       filter_readonly_variables --filter-sandbox < "${T}"/environment \
+               > "${T}"/environment.filtered
        mv "${T}"/environment.filtered "${T}"/environment
        (
                source "${T}"/environment
                # Rely on save_ebuild_env() to filter out any remaining variables
                # and functions that could interfere with the current environment.
-               save_ebuild_env > "${T}"/environment
+               save_ebuild_env | filter_readonly_variables > "${T}"/environment
        )
 }
 
@@ -1508,7 +1522,7 @@ save_ebuild_env() {
 
                set
                export
-       ) | filter_readonly_variables
+       )
 }
 
 # === === === === === === === === === === === === === === === === === ===
@@ -1635,7 +1649,20 @@ elif ! hasq ${EBUILD_PHASE} depend && [ -f "${T}"/environment ] ; then
                # always preprocess the environment when ${PN} == portage.
                preprocess_ebuild_env
        fi
+       # Colon separated SANDBOX_* variables need to be cumulative.
+       for x in SANDBOX_DENY SANDBOX_READ SANDBOX_PREDICT SANDBOX_WRITE ; do
+               eval PORTAGE_${x}=\${!x}
+       done
        source "${T}"/environment
+       for x in SANDBOX_DENY SANDBOX_PREDICT SANDBOX_READ SANDBOX_WRITE ; do
+               eval y=\${PORTAGE_${x}}
+               if [ "${y}" != "${!x}" ] ; then
+                       eval export ${x}=\"$(echo -n "${y}:${!x}" | tr ":" "\0" | \
+                               sort -z -u | tr "\0" ":")\"
+               fi
+               unset PORTAGE_${x}
+       done
+       unset x y
        source_all_bashrcs
 else
 
@@ -1831,7 +1858,7 @@ if [ -n "${EBUILD_SH_ARGS}" ] && \
        ! hasq ${EBUILD_SH_ARGS} clean help info; then
        # Save current environment and touch a success file. (echo for success)
        umask 002
-       save_ebuild_env > "${T}/environment"
+       save_ebuild_env | filter_readonly_variables > "${T}/environment"
        chown ${PORTAGE_USER:-portage}:${PORTAGE_GROUP:-portage} "${T}/environment" &>/dev/null
        chmod g+w "${T}/environment" &>/dev/null
 fi

diff --git a/pym/portage/dbapi/bintree.py b/pym/portage/dbapi/bintree.py
index ef9d7c3c59f3ee20d101bca6c63c3c4f889746fc..dfb5f516b416168b34b41e60c0f8c5e423a0106c 100644 (file)
--- a/pym/portage/dbapi/bintree.py
+++ b/pym/portage/dbapi/bintree.py
@@ -470,11 +470,25 @@ class binarytree(object):
                                        mypkg = myfile[:-5]
                                        if not mycat or not mypf or not slot:
                                                #old-style or corrupt package
-                                               writemsg("!!! Invalid binary package: '%s'\n" % full_path,
-                                                       noiselevel=-1)
-                                               writemsg("!!! This binary package is not " + \
-                                                       "recoverable and should be deleted.\n",
+                                               writemsg("\n!!! Invalid binary package: '%s'\n" % full_path,
                                                        noiselevel=-1)
+                                               missing_keys = []
+                                               if not mycat:
+                                                       missing_keys.append("CATEGORY")
+                                               if not mypf:
+                                                       missing_keys.append("PF")
+                                               if not slot:
+                                                       missing_keys.append("SLOT")
+                                               msg = []
+                                               if missing_keys:
+                                                       missing_keys.sort()
+                                                       msg.append("Missing metadata key(s): %s." % \
+                                                               ", ".join(missing_keys))
+                                               msg.append(" This binary package is not " + \
+                                                       "recoverable and should be deleted.")
+                                               from textwrap import wrap
+                                               for line in wrap("".join(msg), 72):
+                                                       writemsg("!!! %s\n" % line, noiselevel=-1)
                                                self.invalids.append(mypkg)
                                                continue
                                        mycat = mycat.strip()