| 1 |
Author: grobian |
| 2 |
Date: 2009-01-30 21:26:11 +0000 (Fri, 30 Jan 2009) |
| 3 |
New Revision: 12563 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/prefix/bin/ebuild.sh |
| 7 |
main/branches/prefix/man/ebuild.5 |
| 8 |
main/branches/prefix/pym/portage/__init__.py |
| 9 |
Log: |
| 10 |
Merged from trunk -r12552:12556 |
| 11 |
|
| 12 |
| 12553 | Inside fetch(), only mention /var/log/emerge-fetch.log in | |
| 13 |
| zmedico | locking messages when called by emerge. | |
| 14 |
|
| 15 |
| 12554 | Remove the emerge-fetch.log lock message code from fetch() | |
| 16 |
| zmedico | since this is handled by the EbuildBuild class when it | |
| 17 |
| | synchronizes with the prefetcher. | |
| 18 |
|
| 19 |
| 12555 | Add messages before and after the src_prepare phase. Thanks | |
| 20 |
| zmedico | to Arfrever for this patch. | |
| 21 |
|
| 22 |
| 12556 | Fix die() usage in ebuild phase examples. Thanks to Jeremy | |
| 23 |
| zmedico | Olexa <darkside@g.o> for this patch. | |
| 24 |
|
| 25 |
|
| 26 |
Modified: main/branches/prefix/bin/ebuild.sh |
| 27 |
=================================================================== |
| 28 |
--- main/branches/prefix/bin/ebuild.sh 2009-01-30 21:23:15 UTC (rev 12562) |
| 29 |
+++ main/branches/prefix/bin/ebuild.sh 2009-01-30 21:26:11 UTC (rev 12563) |
| 30 |
@@ -896,8 +896,10 @@ |
| 31 |
trap abort_prepare SIGINT SIGQUIT |
| 32 |
|
| 33 |
ebuild_phase pre_src_prepare |
| 34 |
+ vecho ">>> Preparing source in $srcdir ..." |
| 35 |
ebuild_phase src_prepare |
| 36 |
touch "$PORTAGE_BUILDDIR"/.prepared |
| 37 |
+ vecho ">>> Source prepared." |
| 38 |
ebuild_phase post_src_prepare |
| 39 |
|
| 40 |
trap SIGINT SIGQUIT |
| 41 |
|
| 42 |
Modified: main/branches/prefix/man/ebuild.5 |
| 43 |
=================================================================== |
| 44 |
--- main/branches/prefix/man/ebuild.5 2009-01-30 21:23:15 UTC (rev 12562) |
| 45 |
+++ main/branches/prefix/man/ebuild.5 2009-01-30 21:26:11 UTC (rev 12563) |
| 46 |
@@ -25,7 +25,7 @@ |
| 47 |
|
| 48 |
DESCRIPTION="Super\-useful stream editor (sed)" |
| 49 |
HOMEPAGE="http://www.gnu.org/software/sed/sed.html" |
| 50 |
-SRC_URI="ftp://alpha.gnu.org/pub/gnu/sed/${P}.tar.gz" |
| 51 |
+SRC_URI="ftp://alpha.gnu.org/pub/gnu/${PN}/${P}.tar.gz" |
| 52 |
|
| 53 |
LICENSE="GPL\-2" |
| 54 |
SLOT="0" |
| 55 |
@@ -37,14 +37,13 @@ |
| 56 |
|
| 57 |
src_compile() { |
| 58 |
econf \\ |
| 59 |
- \-\-bindir="${EPREFIX}"/bin \\ |
| 60 |
- || die "could not configure" |
| 61 |
+ \-\-bindir="${EPREFIX}"/bin |
| 62 |
emake || die "emake failed" |
| 63 |
} |
| 64 |
|
| 65 |
src_install() { |
| 66 |
emake install DESTDIR="${D}" || die "Install failed" |
| 67 |
- dodoc NEWS README* THANKS AUTHORS BUGS ChangeLog |
| 68 |
+ dodoc NEWS README* THANKS AUTHORS BUGS ChangeLog || die "dodoc failed" |
| 69 |
} |
| 70 |
.fi |
| 71 |
.SH "VARIABLES" |
| 72 |
|
| 73 |
Modified: main/branches/prefix/pym/portage/__init__.py |
| 74 |
=================================================================== |
| 75 |
--- main/branches/prefix/pym/portage/__init__.py 2009-01-30 21:23:15 UTC (rev 12562) |
| 76 |
+++ main/branches/prefix/pym/portage/__init__.py 2009-01-30 21:26:11 UTC (rev 12563) |
| 77 |
@@ -3739,17 +3739,6 @@ |
| 78 |
has_space = False |
| 79 |
|
| 80 |
if distdir_writable and use_locks: |
| 81 |
- waiting_msg = None |
| 82 |
- if not parallel_fetchonly and "parallel-fetch" in features: |
| 83 |
- waiting_msg = ("Fetching '%s' " + \ |
| 84 |
- "in the background. " + \ |
| 85 |
- "To view fetch progress, run `tail -f " + \ |
| 86 |
- EPREFIX + "/var/log/emerge-fetch.log` in another " + \ |
| 87 |
- "terminal.") % myfile |
| 88 |
- msg_prefix = colorize("GOOD", " * ") |
| 89 |
- from textwrap import wrap |
| 90 |
- waiting_msg = "\n".join(msg_prefix + line \ |
| 91 |
- for line in wrap(waiting_msg, 65)) |
| 92 |
|
| 93 |
if locks_in_subdir: |
| 94 |
lock_file = os.path.join(mysettings["DISTDIR"], |
| 95 |
@@ -3760,8 +3749,6 @@ |
| 96 |
lock_kwargs = {} |
| 97 |
if fetchonly: |
| 98 |
lock_kwargs["flags"] = os.O_NONBLOCK |
| 99 |
- else: |
| 100 |
- lock_kwargs["waiting_msg"] = waiting_msg |
| 101 |
|
| 102 |
try: |
| 103 |
file_lock = portage.locks.lockfile(myfile_path, |
Archives