Rename merge-all-overlay to merge-all-secondary to avoid confusion.

diff --git a/bin/wanna-build b/bin/wanna-build
index 636305ebf3e8dc59025291b4393a5c5d2a3d5176..2c0a589987791b1bc2d28d032ebdb70642937fc7 100755 (executable)
--- a/bin/wanna-build
+++ b/bin/wanna-build
@@ -118,7 +118,7 @@ my %options =
         "merge-sources" => { mode => "merge-sources" },
         "pretend-avail" => { short => "p", mode => "pretend-avail" },
         "merge-all"     => { mode => "merge-all" },
-        "merge-all-overlay" => { mode => "merge-all-overlay" },
+        "merge-all-secondary" => { mode => "merge-all-secondary" },
         info                   => { short => "i", mode => "info" },
         'binNMU' => { mode => 'set-binary-nmu', arg => \$binNMUver, 
                             code => sub { die "Invalid binNMU version: $binNMUver\n"
@@ -412,10 +412,16 @@ sub process {
                        call_edos_depcheck( $ARGS[0], $srcs );
                        last SWITCH;
                };
-               /^merge-all-overlay/ && do {
+               /^merge-all-secondary/ && do {
                        die "This operation is restricted to admin users\n"
                                if (defined @conf::admin_users and
                                    !isin( $real_user, @conf::admin_users));
+                       # This is in case the chroot has multiple unrelated
+                       # dist, for instance unstable and experimental.
+                       # This is not for stable and proposed-updates.
+                       # The second packages file contains a combination
+                       # of all Packages files known to the buildd, the
+                       # first only for the current dist.
                        lock_table();
                        my @ARGS = @ARGV;
                        @ARGV = ( $ARGS[0] );