| 1 |
Author: zmedico |
| 2 |
Date: 2008-10-05 05:09:33 +0000 (Sun, 05 Oct 2008) |
| 3 |
New Revision: 11628 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/bin/ebuild.sh |
| 7 |
main/trunk/pym/portage/__init__.py |
| 8 |
Log: |
| 9 |
* When ensuring sane $PWD in ebuild.sh, die if the `cd "$PORTAGE_BUILDDIR"` |
| 10 |
call fails. |
| 11 |
* Create $PORTAGE_BUILDDIR for the "fetch" phase too since it might be |
| 12 |
necessary to call pkg_nofetch. |
| 13 |
|
| 14 |
|
| 15 |
Modified: main/trunk/bin/ebuild.sh |
| 16 |
=================================================================== |
| 17 |
--- main/trunk/bin/ebuild.sh 2008-10-05 04:20:08 UTC (rev 11627) |
| 18 |
+++ main/trunk/bin/ebuild.sh 2008-10-05 05:09:33 UTC (rev 11628) |
| 19 |
@@ -273,7 +273,10 @@ |
| 20 |
} |
| 21 |
|
| 22 |
# Ensure that $PWD is sane whenever possible. |
| 23 |
-cd "$PORTAGE_BUILDDIR" 2>/dev/null |
| 24 |
+if ! hasq "$EBUILD_PHASE" clean depend help ; then |
| 25 |
+ cd "$PORTAGE_BUILDDIR" || \ |
| 26 |
+ die "PORTAGE_BUILDDIR does not exist: '$PORTAGE_BUILDDIR'" |
| 27 |
+fi |
| 28 |
|
| 29 |
#if no perms are specified, dirs/files will have decent defaults |
| 30 |
#(not secretive, but not stupid) |
| 31 |
|
| 32 |
Modified: main/trunk/pym/portage/__init__.py |
| 33 |
=================================================================== |
| 34 |
--- main/trunk/pym/portage/__init__.py 2008-10-05 04:20:08 UTC (rev 11627) |
| 35 |
+++ main/trunk/pym/portage/__init__.py 2008-10-05 05:09:33 UTC (rev 11628) |
| 36 |
@@ -5430,8 +5430,7 @@ |
| 37 |
|
| 38 |
# Build directory creation isn't required for any of these. |
| 39 |
have_build_dirs = False |
| 40 |
- if mydo not in ("clean", "cleanrm", "digest", |
| 41 |
- "fetch", "help", "manifest"): |
| 42 |
+ if mydo not in ("digest", "help", "manifest"): |
| 43 |
mystatus = prepare_build_dirs(myroot, mysettings, cleanup) |
| 44 |
if mystatus: |
| 45 |
return mystatus |
Archives