Merged from trunk 6516:6519

   +------------------------------------------------------------------------+
   | 6517    | Make sure FEATURES=test and USE=test are consistently        |
   | zmedico | enabled for all requested phases when the test phase is      |
   |         | forced via the ebuild command.                               |
   |---------+--------------------------------------------------------------|
   | 6519    | For bug #177763, clarify about how FEATURES=keepwork allows  |
   | zmedico | ${WORKDDIR} to be reused.                                    |
   +------------------------------------------------------------------------+

svn path=/main/branches/prefix/; revision=6521

diff --git a/bin/ebuild b/bin/ebuild
index 723c843dd00849ddf9290240536ffbdb77f5dd95..2d951a55f92bb9b4c8cf99366a8301cdc39eba3f 100755 (executable)
--- a/bin/ebuild
+++ b/bin/ebuild
@@ -126,16 +126,17 @@ def discard_digests(myebuild, mysettings, mydbapi):
        finally:
                portage._doebuild_manifest_exempt_depend -= 1
 
+tmpsettings = portage.config(clone=portage.settings)
+if "test" in pargs and "test" not in tmpsettings.features:
+       print "Forcing test."
+       tmpsettings["EBUILD_FORCE_TEST"] = "1"
+       tmpsettings.backup_changes("EBUILD_FORCE_TEST")
+       tmpsettings.features.append("test")
+       tmpsettings["FEATURES"] = " ".join(tmpsettings.features)
+       tmpsettings.backup_changes("FEATURES")
+
 for arg in pargs:
        try:
-               tmpsettings = portage.config(clone=portage.settings)
-               if arg == "test" and not "test" in tmpsettings.features:
-                       print "Forcing test."
-                       tmpsettings["EBUILD_FORCE_TEST"] = "1"
-                       tmpsettings.backupenv["EBUILD_FORCE_TEST"] = "1"
-                       tmpsettings.features.append("test")
-                       tmpsettings["FEATURES"] = " ".join(tmpsettings.features)
-                       tmpsettings.backup_changes("FEATURES")
                if arg == "digest" and force:
                        discard_digests(ebuild, tmpsettings, portage.portdb)
                a = portage.doebuild(ebuild, arg, portage.root, tmpsettings,

diff --git a/man/make.conf.5 b/man/make.conf.5
index 064f855ad03b658f6fc9bd5abf4d3e6fed987dc1..b0f755c256fff3c283c3f3fa9fb37236cb68c838 100644 (file)
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -184,9 +184,10 @@ is set to include debug information (such as with the \-ggdb flag).
 Do not delete the ${T} directory after the merge process.
 .TP
 .B keepwork
-Do not delete the ${WORKDIR} directory after the merge process.  This also
-disables most of the clean phase that is run prior to each build.  This causes it
-to interfere with normal emerge operation and therefore it should not be left
+Do not delete the ${WORKDIR} directory after the merge process. ${WORKDIR} can
+then be reused since this feature disables most of the clean phase that runs
+prior to each build. Due to lack of proper cleanup, this feature can
+interfere with normal emerge operation and therefore it should not be left
 enabled for more than a short period of time.
 .TP
 .B metadata\-transfer