From 9cea982ec10be91446689c1d72428ee71ae02ece Mon Sep 17 00:00:00 2001 From: Marius Kittler Date: Fri, 6 Jul 2018 16:14:35 +0200 Subject: [PATCH] clone_job: Make _GROUP and _GROUP_ID override each other See https://progress.opensuse.org/issues/38279 --- script/clone_job.pl | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/script/clone_job.pl b/script/clone_job.pl index 11416fb768d..f5148352428 100755 --- a/script/clone_job.pl +++ b/script/clone_job.pl @@ -281,12 +281,20 @@ sub clone_job { if (my $group_id = $job->{group_id}) { $settings{_GROUP_ID} = $group_id; } + my %overrides = ( + _GROUP => '_GROUP_ID', + _GROUP_ID => '_GROUP', + ); + print("settings _GROUP: " . $settings{_GROUP} . "\n"); delete $settings{NAME}; # usually autocreated if ($depth == 0 or $options{'parental-inheritance'}) { for my $arg (@ARGV) { if ($arg =~ /([A-Z0-9_]+)=(.*)/) { if (defined $2) { $settings{$1} = $2; + if (my $override = $overrides{$1}) { + delete $settings{$override}; + } } else { delete $settings{$1};