Make the use of preserved_libs optional by setting the options variable.

Ported from commits:
 462348d88b3a5fa783f322c64131025581ecc220
 f6ad384914a00099eea2a0f66232728c479ec628
 in the master branch.
AUTHOR: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto@gentoo.org> (Sun 14 Apr 2013 08:22:34 PM PDT)

diff --git a/catalyst/defaults.py b/catalyst/defaults.py
index ef5653a24c4a77b9f10893d8a6a05fbbfb1c2eb8..ccff4c5483ab35dde22a208d58058942145a995f 100644 (file)
--- a/catalyst/defaults.py
+++ b/catalyst/defaults.py
@@ -103,5 +103,6 @@ option_messages = {
        "purge": "Purge support enabled.",
        "seedcache": "Seed cache support enabled.",
        "snapcache": "Snapshot cache support enabled.",
+       'preserve_libs': "Preserving libs during unmerge.",
        #"tarball": "Tarball creation enabled.",
        }

diff --git a/etc/catalyst.conf b/etc/catalyst.conf
index d52a5c84096f85b011b55d6a860a683a75be9742..a65413cdbdc4a87fd203c4027c83dd81e7ab232e 100644 (file)
--- a/etc/catalyst.conf
+++ b/etc/catalyst.conf
@@ -60,7 +60,7 @@ hash_function="crc32"
 # pkgcache = keeps a tbz2 of every built package (useful if your build stops
 #      prematurely)
 # preserve_libs = enables portage to preserve used libs when unmerging packages
-#   (used on installcd-stage2 and stage4 targets)
+#      (used on installcd-stage2 and stage4 targets)
 # seedcache = use the build output of a previous target if it exists to speed up
 #      the copy
 # snapcache = cache the snapshot so that it can be bind-mounted into the chroot.