Changeset ferringb@gmail.com-20070318022254-h2xi6v8jqch7jtgc in releases/pkgcore/0.2.8

Timestamp:

03/18/07 03:22:54 (21 months ago)

Author:

Brian Harring <ferringb@…>

changesets:

* [changeset:ferringb@gmail.com-20070317233810-j94933fouqyessv7]
* [changeset:ferringb@gmail.com-20070318022154-ktwyaxl7pjhpw65k]

parent trees:

* source:@ferringb@gmail.com-20070317233810-j94933fouqyessv7
* source:@ferringb@gmail.com-20070318022154-ktwyaxl7pjhpw65k

branch-nick:

pkgcore-dev

Message:

pull in last 0.2.8 tweak

Files:

• pkgcore/bin/ebuild-env/ebuild.sh (modified) (3 diffs)

pkgcore/bin/ebuild-env/ebuild.sh

@@ -252 +252 @@
     if ! hasq "--no-attributes" "$@"; then
         echo "# env attributes"
-        for y in export readonly; do
+        # leave this form so that it's easier to add others in.
+        for y in export ; do
             x=$(${y} | sed -n "/declare \(-[^ ]\+ \)*/!d; s:^declare \(-[^ ]\+ \)*\([A-Za-z0-9_+]\+\)\(=.*$\)\?$:\2:; /^$(gen_regex_var_filter ${DONT_EXPORT_VARS} x y)$/! p;")
             [ -n "$x" ] && echo "${y} $(echo $x);"
@@ -375 +376 @@
         
         filter="^$(gen_regex_var_filter $DONT_EXPORT_VARS XARGS)$"
+        # yes we're intentionally ignoring PKGCORE_ATTRS_READONLY.  readonly isn't currently used.
         PKGCORE_ATTRS_EXPORTED=$(echo $(pkgcore_tmp_func $PKGCORE_ATTRS_EXPORTED | grep -v "$filter"))
-        PKGCORE_ATTRS_READONLY=$(echo $(pkgcore_tmp_func $PKGCORE_ATTRS_READONLY | grep -v "$filter"))
         unset pkgcore_tmp_func filter
 
@@ -382 +383 @@
         local body=
         [ -n "$PKGCORE_ATTRS_EXPORTED" ] && body="export $PKGCORE_ATTRS_EXPORTED;"
-        [ -n "$PKGCORE_ATTRS_READONLY" ] && body="${body} readonly $PKGCORE_ATTRS_READONLY;"
         [ -n "$PKGCORE_SHOPTS_SET" ]     && body="${body} shopt -s ${PKGCORE_SHOPTS_SET};"
         [ -n "$PKGCORE_SHOPTS_UNSET" ]   && body="${body} shopt -u ${PKGCORE_SHOPTS_UNSET};"