| 1 |
Author: zmedico |
| 2 |
Date: 2008-06-27 22:26:22 +0000 (Fri, 27 Jun 2008) |
| 3 |
New Revision: 10818 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/NEWS |
| 7 |
main/trunk/man/emerge.1 |
| 8 |
main/trunk/pym/_emerge/help.py |
| 9 |
Log: |
| 10 |
Add documentation for the new --keep-going option. |
| 11 |
|
| 12 |
|
| 13 |
Modified: main/trunk/NEWS |
| 14 |
=================================================================== |
| 15 |
--- main/trunk/NEWS 2008-06-27 20:58:40 UTC (rev 10817) |
| 16 |
+++ main/trunk/NEWS 2008-06-27 22:26:22 UTC (rev 10818) |
| 17 |
@@ -3,6 +3,11 @@ |
| 18 |
portage-2.2 |
| 19 |
------------- |
| 20 |
|
| 21 |
+* Add emerge --keep-going option to continue as much as possible after |
| 22 |
+ an error. When an error occurs, dependencies are recalculated for |
| 23 |
+ remaining packages and any with unsatisfied dependencies are |
| 24 |
+ automatically dropped. The --skipfirst option automatically drops |
| 25 |
+ packages in the same way, and also drops and masked packages. |
| 26 |
* Add subversion support for repoman. |
| 27 |
* It is now possible to use `emerge <file>` to reinstall the package that |
| 28 |
installed a particular file. Package contents entries are indexed to |
| 29 |
|
| 30 |
Modified: main/trunk/man/emerge.1 |
| 31 |
=================================================================== |
| 32 |
--- main/trunk/man/emerge.1 2008-06-27 20:58:40 UTC (rev 10817) |
| 33 |
+++ main/trunk/man/emerge.1 2008-06-27 22:26:22 UTC (rev 10818) |
| 34 |
@@ -321,6 +321,12 @@ |
| 35 |
.BR "\-\-ignore-default-opts" |
| 36 |
Causes \fIEMERGE_DEFAULT_OPTS\fR (see \fBmake.conf\fR(5)) to be ignored. |
| 37 |
.TP |
| 38 |
+.BR "\-\-keep\-going" |
| 39 |
+Continue as much as possible after an error. When an error occurs, |
| 40 |
+dependencies are recalculated for remaining packages and any with |
| 41 |
+unsatisfied dependencies are automatically dropped. Also see |
| 42 |
+the related \fB\-\-skipfirst\fR option. |
| 43 |
+.TP |
| 44 |
.BR "\-\-newuse " (\fB\-N\fR) |
| 45 |
Tells emerge to include installed packages where USE flags have changed since |
| 46 |
compilation. USE flag changes include: |
| 47 |
@@ -399,9 +405,10 @@ |
| 48 |
.TP |
| 49 |
.BR "\-\-skipfirst" |
| 50 |
This option is only valid when used with \fB\-\-resume\fR. It removes the |
| 51 |
-first package in the resume list so that a merge may continue in the presence |
| 52 |
-of an uncorrectable or inconsequential error. This should only be used in |
| 53 |
-cases where skipping the package will not result in failed dependencies. |
| 54 |
+first package in the resume list. Dependencies are recalculated for |
| 55 |
+remaining packages and any that have unsatisfied dependencies or are |
| 56 |
+masked will be automatically dropped. Also see the related |
| 57 |
+\fB\-\-keep\-going\fR option. |
| 58 |
.TP |
| 59 |
.BR "\-\-tree " (\fB\-t\fR) |
| 60 |
Shows the dependency tree for the given target by indenting dependencies. |
| 61 |
|
| 62 |
Modified: main/trunk/pym/_emerge/help.py |
| 63 |
=================================================================== |
| 64 |
--- main/trunk/pym/_emerge/help.py 2008-06-27 20:58:40 UTC (rev 10817) |
| 65 |
+++ main/trunk/pym/_emerge/help.py 2008-06-27 22:26:22 UTC (rev 10818) |
| 66 |
@@ -15,8 +15,8 @@ |
| 67 |
print " "+turquoise("emerge")+" "+turquoise("--resume")+" [ "+green("--pretend")+" | "+green("--ask")+" | "+green("--skipfirst")+" ]" |
| 68 |
print " "+turquoise("emerge")+" "+turquoise("--help")+" [ "+green("system")+" | "+green("world")+" | "+green("--sync")+" ] " |
| 69 |
print bold("Options:")+" "+green("-")+"["+green("abBcCdDefgGhkKlnNoOpqPsStuvV")+"]" |
| 70 |
- print " [ "+green("--columns")+" ] [ "+green("--deep")+" ] [ "+green("--newuse")+" ]" |
| 71 |
- print " [ "+green("--noconfmem")+" ] [ "+green("--nospinner")+" ] [ "+green("--oneshot")+" ]" |
| 72 |
+ print " [ "+green("--columns")+" ] [ "+green("--deep")+" ] [ "+green("--keep-going")+" ] [ "+green("--newuse")+" ]" |
| 73 |
+ print " [ "+green("--noconfmem")+" ] [ "+green("--nospinner")+" ] [ "+green("--oneshot")+" ]" |
| 74 |
print " [ " + green("--color")+" < " + turquoise("y") + " | "+ turquoise("n")+" > ] [ "+green("--complete-graph")+" ]" |
| 75 |
print " [ "+green("--reinstall ")+turquoise("changed-use")+" ] [ " + green("--with-bdeps")+" < " + turquoise("y") + " | "+ turquoise("n")+" > ]" |
| 76 |
print bold("Actions:")+" [ "+green("--clean")+" | "+green("--depclean")+" | "+green("--prune")+" | "+green("--regen")+" | "+green("--search")+" | "+green("--unmerge")+" ]" |
| 77 |
@@ -292,6 +292,17 @@ |
| 78 |
print " downloaded from the remote server without consulting packages" |
| 79 |
print " existing in the packages directory." |
| 80 |
print |
| 81 |
+ print " "+green("--keep-going") |
| 82 |
+ desc = "Continue as much as possible after " + \ |
| 83 |
+ "an error. When an error occurs, " + \ |
| 84 |
+ "dependencies are recalculated for " + \ |
| 85 |
+ "remaining packages and any with " + \ |
| 86 |
+ "unsatisfied dependencies are " + \ |
| 87 |
+ "automatically dropped. Also see " + \ |
| 88 |
+ "the related --skipfirst option." |
| 89 |
+ for line in wrap(desc, desc_width): |
| 90 |
+ print desc_indent + line |
| 91 |
+ print |
| 92 |
print " "+green("--newuse")+" ("+green("-N")+" short option)" |
| 93 |
print " Tells emerge to include installed packages where USE flags have " |
| 94 |
print " changed since installation." |
| 95 |
@@ -349,11 +360,17 @@ |
| 96 |
print " enabled are added or removed." |
| 97 |
print |
| 98 |
print " "+green("--skipfirst") |
| 99 |
- print " This option is only valid in a resume situation. It removes the" |
| 100 |
- print " first package in the resume list so that a merge may continue in" |
| 101 |
- print " the presence of an uncorrectable or inconsequential error. This" |
| 102 |
- print " should only be used in cases where skipping the package will not" |
| 103 |
- print " result in failed dependencies." |
| 104 |
+ desc = "This option is only valid when " + \ |
| 105 |
+ "used with --resume. It removes the " + \ |
| 106 |
+ "first package in the resume list. " + \ |
| 107 |
+ "Dependencies are recalculated for " + \ |
| 108 |
+ "remaining packages and any that " + \ |
| 109 |
+ "have unsatisfied dependencies or are " + \ |
| 110 |
+ "masked will be automatically dropped. " + \ |
| 111 |
+ "Also see the related " + \ |
| 112 |
+ "--keep-going option." |
| 113 |
+ for line in wrap(desc, desc_width): |
| 114 |
+ print desc_indent + line |
| 115 |
print |
| 116 |
print " "+green("--tree")+" ("+green("-t")+" short option)" |
| 117 |
print " Shows the dependency tree using indentation for dependencies." |
| 118 |
|
| 119 |
-- |
| 120 |
gentoo-commits@l.g.o mailing list |
Archives