Skip to content

Commit

Permalink
kiwi product build: put all appdata files into an 'appdata' directory
Browse files Browse the repository at this point in the history
Before we used the scheduler arch, this led to kiwi not finding the
appdata file if the package had a different architecture (e.g. noarch).

(Also needs a fix in KIWICollect.)
  • Loading branch information
mlschroe authored and adrianschroeter committed Mar 24, 2014
1 parent 002f9ba commit c966699
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/backend/bs_worker
Original file line number Diff line number Diff line change
Expand Up @@ -1278,7 +1278,7 @@ sub getbinaries_kiwiproduct {
if ($name =~ /-[^-]+-[^-]+\.([a-zA-Z][^\.\-]*)\.rpm$/) {
$rarch = $1;
} elsif ($name =~ /appdata\.xml$/) {
$rarch = $arch;
$rarch = 'appdata';
}
next unless $rarch;
next if $nodbgpkgs && $name =~ /-(?:debuginfo|debugsource)-/;
Expand Down Expand Up @@ -1387,7 +1387,7 @@ sub getbinaries_kiwiproduct {
if ($name =~ /-[^-]+-[^-]+\.([a-zA-Z][^\.\-]*)\.rpm$/) {
$rarch = $1;
} elsif ($name =~ /appdata\.xml$/) {
$rarch = $arch;
$rarch = 'appdata';
}
return undef unless $rarch;
mkdir_p("$param->{'directory'}/$rarch");
Expand All @@ -1413,7 +1413,7 @@ sub getbinaries_kiwiproduct {
if ($bin =~ /-[^-]+-[^-]+\.([a-zA-Z][^\.\-]*)\.rpm$/) {
$rarch = $1;
} elsif ($bin =~ /appdata\.xml$/) {
$rarch = $arch;
$rarch = 'appdata';
}
next unless $rarch;
my @s = stat("$ddir/$rarch/$bin.new.rpm");
Expand Down Expand Up @@ -1470,7 +1470,7 @@ sub getbinaries_kiwiproduct {
if ($name =~ /-[^-]+-[^-]+\.([a-zA-Z][^\.\-]*)\.rpm$/) {
$rarch = $1;
} elsif ($name =~ /appdata\.xml$/) {
$rarch = $arch;
$rarch = 'appdata';
}
return undef unless $rarch;
return undef if $nodbgpkgs && $name =~ /-(?:debuginfo|debugsource)-/;
Expand Down

0 comments on commit c966699

Please sign in to comment.