diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | modules/WorkspaceCreator.pm | 8 |
2 files changed, 15 insertions, 1 deletions
@@ -1,3 +1,11 @@ +Mon Feb 23 12:34:28 UTC 2015 Chad Elliott <elliott_c@ociweb.com> + + * modules/WorkspaceCreator.pm: + + Do not completely override -value_template and -value_project + settings given on the actual MPC command line with workspace + 'cmdline' settings. They are now merged together. + Thu Jan 08 07:50:12 UTC 2015 Johnny Willemsen <jwillemsen@remedy.nl * All files: diff --git a/modules/WorkspaceCreator.pm b/modules/WorkspaceCreator.pm index b3fc827d..ff619bc3 100644 --- a/modules/WorkspaceCreator.pm +++ b/modules/WorkspaceCreator.pm @@ -2862,8 +2862,14 @@ sub process_cmdline { push(@{$parameters->{$key}}, @{$options->{$key}}); } elsif ($type eq 'HASH') { + my $merge = ($key eq 'addtemp' || $key eq 'addproj'); foreach my $hk (keys %{$options->{$key}}) { - $parameters->{$key}->{$hk} = $options->{$key}->{$hk}; + if ($merge && defined $parameters->{$key}->{$hk}) { + push(@{$parameters->{$key}->{$hk}}, @{$options->{$key}->{$hk}}); + } + else { + $parameters->{$key}->{$hk} = $options->{$key}->{$hk}; + } } } elsif ($type eq 'SCALAR') { |