--- This fixes the redhat-style comps.xml generation problem reported by Robert Xu. It also makes a better job of cleaning up old group.xml files. It needs to be applied to 2.0 and later. src/backend/bs_publish | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/backend/bs_publish b/src/backend/bs_publish index d6c51c4..229dd5b 100755 --- a/src/backend/bs_publish +++ b/src/backend/bs_publish @@ -546,8 +546,7 @@ sub createpatterns_comps { my @grps; for my $pattern (@$patterns) { my $pat = XMLin($BSXML::pattern, $pattern->{'data'}); - next unless $pattern->{'name'} =~ /^(.*)\.xml$/s; - my $grp = { 'id' => $1 }; + my $grp = { 'id' => $pattern->{'name'} }; for (@{$pat->{'summary'}}) { my $el = { '_content' => $_->{'_content'} }; $el->{'xml:lang'} = $_->{lang} if $_->{'lang'}; @@ -587,7 +586,7 @@ sub createpatterns_comps { sub deletepatterns_comps { my ($extrep) = @_; for my $pat (ls("$extrep/repodata")) { - next unless $pat =~ /^group/; + next unless $pat =~ /group.xml/; unlink("$extrep/repodata/$pat"); } } -- 1.7.2 -- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-buildservice+help@opensuse.org