Skip to content

multibuild: add buildemptyflavor attribute to _multibuild xml #1124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rjd15372 wants to merge 1 commit into
base: master
Choose a base branch
from
+6 −0
Open

multibuild: add buildemptyflavor attribute to _multibuild xml #1124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions PBuild/Multibuild.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ use PBuild::Verify;

my $dtd_multibuild = [
'multibuild' =>
'buildemptyflavor',
[ 'package' ], # obsolete
[ 'flavor' ],
];
Expand Down Expand Up @@ -73,10 +74,12 @@ sub expand_multibuilds {
my $mb = getmultibuild_fromfiles($p->{'dir'}, $p->{'files'});
next unless $mb;
my @mbp = @{$mb->{'flavor'} || $mb->{'package'} || []};
my $buildemptyflavor = !defined($mb->{'buildemptyflavor'}) || $mb->{'buildemptyflavor'} eq 'true' ? 1 : 0;
for my $flavor (@mbp) {
my $mpkg = "$pkg:$flavor";
$pkgs->{$mpkg} = { %$p, 'pkg' => $mpkg, 'flavor' => $flavor, 'originpackage' => $pkg };
}
delete $pkgs->{$pkg} if @mbp && !$buildemptyflavor;
}
}

Expand Down
3 changes: 3 additions & 0 deletions PBuild/Verify.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,9 @@ sub verify_nevraquery {

sub verify_multibuild {
my ($mb) = @_;
if (defined($mb->{'buildemptyflavor'})) {
die("buildemptyflavor must be either 'true' or 'false'\n") unless $mb->{'buildemptyflavor'} eq 'true' || $mb->{'buildemptyflavor'} eq 'false';
}
die("multibuild cannot have both package and flavor elements\n") if $mb->{'package'} && $mb->{'flavor'};
for my $packid (@{$mb->{'package'} || []}) {
verify_packid($packid);
Expand Down