diff options
Diffstat (limited to 'app-admin/python-updater/files')
| -rw-r--r-- | app-admin/python-updater/files/python-updater-0.10-expand-aliases.patch | 11 | ||||
| -rw-r--r-- | app-admin/python-updater/files/python-updater-0.10-only-alias-sed-if-exists.patch | 23 |
2 files changed, 34 insertions, 0 deletions
diff --git a/app-admin/python-updater/files/python-updater-0.10-expand-aliases.patch b/app-admin/python-updater/files/python-updater-0.10-expand-aliases.patch new file mode 100644 index 000000000000..d48e221f2d30 --- /dev/null +++ b/app-admin/python-updater/files/python-updater-0.10-expand-aliases.patch @@ -0,0 +1,11 @@ +--- python-updater ++++ python-updater +@@ -67,6 +67,8 @@ + # Portage variables. + PKG_DBDIR="/var/db/pkg" + ++shopt -s expand_aliases ++ + # usage() + # display usage + usage() { diff --git a/app-admin/python-updater/files/python-updater-0.10-only-alias-sed-if-exists.patch b/app-admin/python-updater/files/python-updater-0.10-only-alias-sed-if-exists.patch new file mode 100644 index 000000000000..20051f51594d --- /dev/null +++ b/app-admin/python-updater/files/python-updater-0.10-only-alias-sed-if-exists.patch @@ -0,0 +1,23 @@ +Only alias sed to /usr/lib/portage/bin/ebuild-helpers/sed if the +latter exists (which should be the case on prefix portages, but not on +normal ones). Fixes fallout from bug #370935 on non-prefix portages. + +--- python-updater ++++ python-updater +@@ -488,8 +488,15 @@ + shift + done + ++# On a prefix portage we need to use sed from ebuild-helpers/ instead ++# of $PATH. On non-prefix portages ebuild-helpers/sed does not exist. ++# Prepending ebuild-helpers/ to $PATH uses too many tools from there. ++# So alias sed to ebuild-helpers/sed if it exists: + if [[ "${PMS_COMMAND[${PMS_INDEX}]}" == "emerge" ]]; then +- alias sed="$(/usr/bin/python -c "import os; print(os.path.dirname(os.path.realpath('$(type -p emerge)')))")/ebuild-helpers/sed" ++ sed="$(/usr/bin/python -c "import os; print(os.path.dirname(os.path.realpath('$(type -p emerge)')))")/ebuild-helpers/sed" ++ if [[ -x "${sed}" ]]; then ++ alias sed="${sed}" ++ fi + fi + + if has_version "=dev-lang/python-2*"; then |