activate merge-v3 also for overlay / secondary suites (in addition to

[wannabuild.git] / bin / wanna-build

diff --git a/bin/wanna-build b/bin/wanna-build
index 232b0b5b98d70dc8259f81d4bcf0d398e885b948..e76e2f80eadf58eb082b2afdc9c30f67818db872 100755 (executable)
--- a/bin/wanna-build
+++ b/bin/wanna-build
@@ -107,6 +107,7 @@ elsif ($progname =~ /^list-(.*)$/) {
 
 my %options =
        (# flags
+        simulate       => { flag => \$simulate }, # this is not supported by all operations (yet)!
         verbose        => { short => "v", flag => \$verbose },
         override               => { short => "o", flag => \$opt_override },
         "create-db"    => { flag => \$opt_create_db },
@@ -493,6 +494,8 @@ sub process {
                         # call with installed-packages+ . installed-sources+ [ . available-for-build-packages+ ]
                         # in case available-for-build-packages is not specified, installed-packages are used
                         lock_table() unless $simulate;
+                        my $replacemap = { '%ARCH%' => $arch, '%SUITE%' => $distribution };
+                        map { my $k = $_; grep { $k =~ s,$_,$replacemap->{$_}, } keys %{$replacemap}; $_ = $k; } @ARGV;
                         my @ipkgs = &parse_argv( \@ARGV, '.');
                         my @isrcs = &parse_argv( \@ARGV, '.');
                         my @bpkgs = &parse_argv( \@ARGV, '.');
@@ -2575,7 +2578,7 @@ sub call_edos_depcheck {
        }
        if ($change) {
            log_ta( $pkg, "--merge-all (edos)" ) unless $simulate;
-           print "edos-builddebchange changed state of ${key}_$pkg->{'version'} to $pkg->{'state'}\n" if $verbose || $simulate;
+           print "edos-builddebchange changed state of ${key}_$pkg->{'version'} ($args->{'arch'}) to $pkg->{'state'}\n" if $verbose || $simulate;
        }
        if ($change || $problemchange) {
            update_source_info($pkg) unless $simulate;
@@ -2584,7 +2587,7 @@ sub call_edos_depcheck {
 
     for my $key (keys %interesting_packages_depwait) {
         if ($interesting_packages_depwait{$key}) {
-            print "dependency on $key not fullfiled yet\n" if $verbose || $simulate;
+            print "dep-wait for $key ($args->{'arch'}) not fullfiled yet\n" if $verbose || $simulate;
             next;
         }
        my $pkg = $db->{$key};
@@ -2596,7 +2599,7 @@ sub call_edos_depcheck {
            }
        log_ta( $pkg, "edos_depcheck: depwait" ) unless $simulate;
        update_source_info($pkg) unless $simulate;
-       print "edos-builddebchange changed state of ${key}_$pkg->{'version'} to $pkg->{'state'}\n" if $verbose || $simulate;
+       print "edos-builddebchange changed state of ${key}_$pkg->{'version'} ($args->{'arch'}) from dep-wait to $pkg->{'state'}\n" if $verbose || $simulate;
     }
 }
 
@@ -2895,6 +2898,7 @@ sub parse_all_v3() {
                     next SRCS;
                 }
             }
+            $pkg->{'package'}  = $name;
         }
 
         if ($pkgs->{'status'} eq 'installed' && $pkg->{'binary_nmu_version'} && $pkgs->{'binnmu'} < $pkg->{'binary_nmu_version'}) {