| 1 |
Author: grobian |
| 2 |
Date: 2009-04-25 08:37:23 +0000 (Sat, 25 Apr 2009) |
| 3 |
New Revision: 13393 |
| 4 |
|
| 5 |
Added: |
| 6 |
main/branches/prefix/bin/ebuild-helpers/3/ |
| 7 |
Modified: |
| 8 |
main/branches/prefix/bin/ebuild.sh |
| 9 |
main/branches/prefix/bin/repoman |
| 10 |
main/branches/prefix/man/portage.5 |
| 11 |
main/branches/prefix/pym/_emerge/__init__.py |
| 12 |
Log: |
| 13 |
Merged from trunk -r13375:13383 |
| 14 |
|
| 15 |
| 13377 | When in --nodeps mode, make depgraph._serialize_tasks() | |
| 16 |
| zmedico | preserve the package order given on the command line. Thanks | |
| 17 |
| | to Markus Duft <mduft@g.o> for reporting. | |
| 18 |
|
| 19 |
| 13378 | Clarify language in repos.conf reference to repoman and | |
| 20 |
| zmedico | egencache. | |
| 21 |
|
| 22 |
| 13379 | Exit unsuccessfully when in commit mode and nothing is found | |
| 23 |
| zmedico | to commit. Thanks to Jeremy Olexa <darkside@g.o> for the | |
| 24 |
| | suggestion. | |
| 25 |
|
| 26 |
| 13380 | Add ${PORTAGE_BIN_PATH}/ebuild-helpers/3 directory to PATH | |
| 27 |
| zmedico | for EAPI 3. Thanks to Tiziano M?\195?\188ller <dev-zero@g.o> for | |
| 28 |
| | this patch. | |
| 29 |
|
| 30 |
| 13381 | In ebuild_main(), unset ebuild_helpers_path when finished | |
| 31 |
| zmedico | with it, since bash exposes local variables to 'children'. | |
| 32 |
|
| 33 |
| 13382 | Add new dodoc implementation for EAPI 3. Thanks to to | |
| 34 |
| zmedico | Tiziano M?\195?\188ller <dev-zero@g.o> for this patch. | |
| 35 |
|
| 36 |
| 13383 | Use ret|=1 instead of ++ret, to avoid possible overflow. | |
| 37 |
| zmedico | | |
| 38 |
|
| 39 |
|
| 40 |
Copied: main/branches/prefix/bin/ebuild-helpers/3 (from rev 13383, main/trunk/bin/ebuild-helpers/3) |
| 41 |
|
| 42 |
Modified: main/branches/prefix/bin/ebuild.sh |
| 43 |
=================================================================== |
| 44 |
--- main/branches/prefix/bin/ebuild.sh 2009-04-25 08:35:39 UTC (rev 13392) |
| 45 |
+++ main/branches/prefix/bin/ebuild.sh 2009-04-25 08:37:23 UTC (rev 13393) |
| 46 |
@@ -1912,6 +1912,20 @@ |
| 47 |
ebuild_main() { |
| 48 |
local f x |
| 49 |
|
| 50 |
+ # we may want to make this configurable somewhere else |
| 51 |
+ local ebuild_helpers_path |
| 52 |
+ case ${EAPI} in |
| 53 |
+ 3|3_pre1) |
| 54 |
+ ebuild_helpers_path="${PORTAGE_BIN_PATH}/ebuild-helpers/3:${PORTAGE_BIN_PATH}/ebuild-helpers" |
| 55 |
+ ;; |
| 56 |
+ *) |
| 57 |
+ ebuild_helpers_path="${PORTAGE_BIN_PATH}/ebuild-helpers" |
| 58 |
+ ;; |
| 59 |
+ esac |
| 60 |
+ |
| 61 |
+ export PATH="/usr/local/sbin:/sbin:/usr/sbin:${ebuild_helpers_path}:/usr/local/bin:/bin:/usr/bin:${ROOTPATH}" |
| 62 |
+ unset ebuild_helpers_path |
| 63 |
+ |
| 64 |
if ! hasq $EBUILD_SH_ARGS clean depend help info nofetch ; then |
| 65 |
|
| 66 |
if hasq distcc $FEATURES ; then |
| 67 |
|
| 68 |
Modified: main/branches/prefix/bin/repoman |
| 69 |
=================================================================== |
| 70 |
--- main/branches/prefix/bin/repoman 2009-04-25 08:35:39 UTC (rev 13392) |
| 71 |
+++ main/branches/prefix/bin/repoman 2009-04-25 08:37:23 UTC (rev 13393) |
| 72 |
@@ -1900,7 +1900,7 @@ |
| 73 |
print |
| 74 |
print "(Didn't find any changed files...)" |
| 75 |
print |
| 76 |
- sys.exit(0) |
| 77 |
+ sys.exit(1) |
| 78 |
|
| 79 |
# Manifests need to be regenerated after all other commits, so don't commit |
| 80 |
# them now even if they have changed. |
| 81 |
|
| 82 |
Modified: main/branches/prefix/man/portage.5 |
| 83 |
=================================================================== |
| 84 |
--- main/branches/prefix/man/portage.5 2009-04-25 08:35:39 UTC (rev 13392) |
| 85 |
+++ main/branches/prefix/man/portage.5 2009-04-25 08:37:23 UTC (rev 13393) |
| 86 |
@@ -551,7 +551,8 @@ |
| 87 |
.BR repos.conf |
| 88 |
Specifies \fIsite\-specific\fR repository configuration information. Note that |
| 89 |
configuration settings which are specified here do not apply to tools |
| 90 |
-such as \fBrepoman\fR(1) and \fBegencache\fR(1) since their operations |
| 91 |
+such as \fBrepoman\fR(1) and \fBegencache\fR(1), since operations |
| 92 |
+performed by these tools |
| 93 |
are inherently \fBnot\fR \fIsite\-specific\fR. \fBWARNING:\fR Use of |
| 94 |
\fBrepos.conf\fR is generally not recommended since resulting changes in |
| 95 |
eclass inheritance (especially due to \fBeclass\-overrides\fR) may trigger |
| 96 |
|
| 97 |
Modified: main/branches/prefix/pym/_emerge/__init__.py |
| 98 |
=================================================================== |
| 99 |
--- main/branches/prefix/pym/_emerge/__init__.py 2009-04-25 08:35:39 UTC (rev 13392) |
| 100 |
+++ main/branches/prefix/pym/_emerge/__init__.py 2009-04-25 08:37:23 UTC (rev 13393) |
| 101 |
@@ -7065,6 +7065,13 @@ |
| 102 |
writemsg("\n", noiselevel=-1) |
| 103 |
|
| 104 |
scheduler_graph = self.digraph.copy() |
| 105 |
+ |
| 106 |
+ if '--nodeps' in self.myopts: |
| 107 |
+ # Preserve the package order given on the command line. |
| 108 |
+ return ([node for node in scheduler_graph \ |
| 109 |
+ if isinstance(node, Package) \ |
| 110 |
+ and node.operation == 'merge'], scheduler_graph) |
| 111 |
+ |
| 112 |
mygraph=self.digraph.copy() |
| 113 |
# Prune "nomerge" root nodes if nothing depends on them, since |
| 114 |
# otherwise they slow down merge order calculation. Don't remove |
Archives