| 1 |
Author: zmedico |
| 2 |
Date: 2008-09-13 23:30:24 +0000 (Sat, 13 Sep 2008) |
| 3 |
New Revision: 11512 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/bin/ebuild.sh |
| 7 |
main/trunk/bin/misc-functions.sh |
| 8 |
Log: |
| 9 |
Remove unneeded quotes from PYTHONPATH assignments and also fix one more |
| 10 |
potential redundant colon inside misc-functions.sh. |
| 11 |
|
| 12 |
|
| 13 |
Modified: main/trunk/bin/ebuild.sh |
| 14 |
=================================================================== |
| 15 |
--- main/trunk/bin/ebuild.sh 2008-09-13 23:21:43 UTC (rev 11511) |
| 16 |
+++ main/trunk/bin/ebuild.sh 2008-09-13 23:30:24 UTC (rev 11512) |
| 17 |
@@ -166,7 +166,7 @@ |
| 18 |
fi |
| 19 |
# return shell-true/shell-false if exists. |
| 20 |
# Takes single depend-type atoms. |
| 21 |
- PYTHONPATH="${PORTAGE_PYM_PATH}${PYTHONPATH:+:}${PYTHONPATH}" \ |
| 22 |
+ PYTHONPATH=${PORTAGE_PYM_PATH}${PYTHONPATH:+:}${PYTHONPATH} \ |
| 23 |
"${PORTAGE_BIN_PATH}"/portageq has_version "${ROOT}" "$1" |
| 24 |
local retval=$? |
| 25 |
case "${retval}" in |
| 26 |
@@ -186,7 +186,7 @@ |
| 27 |
if [ "${EBUILD_PHASE}" == "depend" ]; then |
| 28 |
die "portageq calls are not allowed in the global scope" |
| 29 |
fi |
| 30 |
- PYTHONPATH="${PORTAGE_PYM_PATH}${PYTHONPATH:+:}${PYTHONPATH}" \ |
| 31 |
+ PYTHONPATH=${PORTAGE_PYM_PATH}${PYTHONPATH:+:}${PYTHONPATH} \ |
| 32 |
"${PORTAGE_BIN_PATH}/portageq" "$@" |
| 33 |
} |
| 34 |
|
| 35 |
@@ -202,7 +202,7 @@ |
| 36 |
fi |
| 37 |
# returns the best/most-current match. |
| 38 |
# Takes single depend-type atoms. |
| 39 |
- PYTHONPATH="${PORTAGE_PYM_PATH}${PYTHONPATH:+:}${PYTHONPATH}" \ |
| 40 |
+ PYTHONPATH=${PORTAGE_PYM_PATH}${PYTHONPATH:+:}${PYTHONPATH} \ |
| 41 |
"${PORTAGE_BIN_PATH}/portageq" 'best_version' "${ROOT}" "$1" |
| 42 |
local retval=$? |
| 43 |
case "${retval}" in |
| 44 |
|
| 45 |
Modified: main/trunk/bin/misc-functions.sh |
| 46 |
=================================================================== |
| 47 |
--- main/trunk/bin/misc-functions.sh 2008-09-13 23:21:43 UTC (rev 11511) |
| 48 |
+++ main/trunk/bin/misc-functions.sh 2008-09-13 23:30:24 UTC (rev 11512) |
| 49 |
@@ -639,7 +639,7 @@ |
| 50 |
tar $tar_options -cf - $PORTAGE_BINPKG_TAR_OPTS -C "${D}" . | \ |
| 51 |
bzip2 -f > "$PORTAGE_BINPKG_TMPFILE" || \ |
| 52 |
die "Failed to create tarball" |
| 53 |
- export PYTHONPATH="${PORTAGE_PYM_PATH:-/usr/lib/portage/pym}:${PYTHONPATH}" |
| 54 |
+ PYTHONPATH=${PORTAGE_PYM_PATH}${PYTHONPATH:+:}${PYTHONPATH} \ |
| 55 |
python -c "from portage import xpak; t=xpak.tbz2('${PORTAGE_BINPKG_TMPFILE}'); t.recompose('${PORTAGE_BUILDDIR}/build-info')" |
| 56 |
if [ $? -ne 0 ]; then |
| 57 |
rm -f "${PORTAGE_BINPKG_TMPFILE}" |
Archives