From c72ff2efb30890213e4b6097bea521a96a72b665 Mon Sep 17 00:00:00 2001 From: Don Armstrong Date: Mon, 19 Mar 2012 11:53:55 -0700 Subject: [PATCH] properly handle fixed_versions and found_versions --- Debbugs/Control.pm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Debbugs/Control.pm b/Debbugs/Control.pm index c5d73d1..4d44237 100644 --- a/Debbugs/Control.pm +++ b/Debbugs/Control.pm @@ -2373,10 +2373,12 @@ sub __calculate_merge_changes{ }, fixed_versions => {func => \&set_fixed, key => 'fixed', + modify_value => sub {(defined $_[0] and ref($_[0]) eq 'HASH')?[sort keys %{$_[0]}]:$_[0]}, allowed => 1, }, found_versions => {func => \&set_found, key => 'found', + modify_value => sub {(defined $_[0] and ref($_[0]) eq 'HASH')?[sort keys %{$_[0]}]:$_[0]}, allowed => 1, }, ); @@ -2402,7 +2404,7 @@ sub __calculate_merge_changes{ (exists $force_functions{$field}{modify_value} ? $force_functions{$field}{modify_value}->($merge_status->{$field}): $merge_status->{$field}), - value => ref($merge_status->{$field}) eq 'HASH'?[sort keys %{$merge_status->{$field}}]:$merge_status->{$field}, + value => $merge_status->{$field}, function => $force_functions{$field}{func}, key => $force_functions{$field}{key}, options => $force_functions{$field}{options}, -- 2.39.2