From c8c9ba1b3b5c7889cca9f2b9479b756f1c134a69 Mon Sep 17 00:00:00 2001 From: Kurt Roeckx Date: Wed, 10 Feb 2010 22:09:05 +0000 Subject: [PATCH] Add option to merge a second Packages This allows a suite like experimental to also have the Packages file from unstable so that we know better what is installable and what is not. --- bin/wanna-build | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/bin/wanna-build b/bin/wanna-build index 6341659..b059531 100755 --- a/bin/wanna-build +++ b/bin/wanna-build @@ -118,6 +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" }, info => { short => "i", mode => "info" }, 'binNMU' => { mode => 'set-binary-nmu', arg => \$binNMUver, code => sub { die "Invalid binNMU version: $binNMUver\n" @@ -396,7 +397,7 @@ sub process { pretend_avail( @ARGV ); last SWITCH; }; - /^merge-all/ && do { + /^merge-all$/ && do { die "This operation is restricted to admin users\n" if (defined @conf::admin_users and !isin( $real_user, @conf::admin_users)); @@ -411,6 +412,21 @@ sub process { call_edos_depcheck( $ARGS[0], $srcs ); last SWITCH; }; + /^merge-all-overlay/ && do { + die "This operation is restricted to admin users\n" + if (defined @conf::admin_users and + !isin( $real_user, @conf::admin_users)); + lock_table(); + my @ARGS = @ARGV; + @ARGV = ( $ARGS[0] ); + my $pkgs = parse_packages(); + @ARGV = ( $ARGS[1] ); + parse_quinn_diff(0); + @ARGV = ( $ARGS[2] ); + my $srcs = parse_sources(1); + call_edos_depcheck( $ARGS[3], $srcs ); + last SWITCH; + }; /^import/ && do { die "This operation is restricted to admin users\n" if (defined @conf::admin_users and -- 2.39.2