Verified Commit a7fdf7c3 authored by boklm's avatar boklm
Browse files

fixup! Bug 40027: Fix incremental .mar creation for esr78

parent 1d90d3c5
......@@ -190,9 +190,8 @@ sub mar_filename {
}
sub create_incremental_mar {
my ($config, $pm, $from_version, $new_version, $os, $lang, @channels) = @_;
my ($config, $pm, $from_version, $new_version, $os, $lang, $channel) = @_;
my $appname = $config->{appname_marfile};
my $channel = $channels[0];
my $mar_file = "$appname-$os-${from_version}-${new_version}_$lang.incremental.mar";
my $mar_file_path = version_dir($config, $new_version) . '/' . $mar_file;
if ($ENV{MAR_SKIP_EXISTING} && -f $mar_file_path) {
......@@ -243,7 +242,7 @@ sub create_incremental_mar {
}
sub create_incremental_mars_for_version {
my ($config, $version, @channels) = @_;
my ($config, $version, $channel) = @_;
my $pm = Parallel::ForkManager->new(get_nbprocs);
$pm->run_on_finish(sub { $_[2]->(@_) });
my $v = $config->{versions}{$version};
......@@ -254,7 +253,7 @@ sub create_incremental_mars_for_version {
foreach my $os (keys %{$v->{files}}) {
foreach my $lang (keys %{$v->{files}{$os}}) {
next unless defined $from_v->{files}{$os}{$lang}{complete};
create_incremental_mar($config, $pm, $from_version, $version, $os, $lang, @channels);
create_incremental_mar($config, $pm, $from_version, $version, $os, $lang, $channel);
}
}
}
......@@ -643,10 +642,11 @@ my %actions = (
},
gen_incrementals => sub {
my ($config) = @_;
foreach my $version (channel_to_version($config, @ARGV)) {
foreach my $channel (@ARGV) {
my $version = channel_to_version($config, $channel);
extract_martools($config, $version);
get_version_files($config, $version);
create_incremental_mars_for_version($config, $version, @ARGV);
create_incremental_mars_for_version($config, $version, $channel);
}
},
download_missing_versions => sub {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment