From 33b5841ee03e9c0d5a36c53f608417359b554676 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 14 Aug 2009 10:22:28 +0000 Subject: [PATCH] support opposite order of repository priorities for smart --- Build/Kiwi.pm | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/Build/Kiwi.pm b/Build/Kiwi.pm index 8b8988a..4840fb0 100644 --- a/Build/Kiwi.pm +++ b/Build/Kiwi.pm @@ -157,11 +157,20 @@ sub kiwiparse { } } - foreach my $repository(sort {$a->{priority} <=> $b->{priority}} @{$kiwi->{'repository'} || []}) { - my $kiwisource = ($repository->{'source'} || [])->[0]; - next if $kiwisource->{'path'} eq '/var/lib/empty'; # grr - die("bad path: $kiwisource->{'path'}\n") unless $kiwisource->{'path'} =~ /^obs:\/\/\/?([^\/]+)\/([^\/]+)\/?$/; - push @repos, "$1/$2"; + if ($preferences->{'packagemanager'}->[0]->{'_content'} eq 'smart') { + foreach my $repository(sort {$b->{priority} <=> $a->{priority}} @{$kiwi->{'repository'} || []}) { + my $kiwisource = ($repository->{'source'} || [])->[0]; + next if $kiwisource->{'path'} eq '/var/lib/empty'; # grr + die("bad path: $kiwisource->{'path'}\n") unless $kiwisource->{'path'} =~ /^obs:\/\/\/?([^\/]+)\/([^\/]+)\/?$/; + push @repos, "$1/$2"; + } + }else{ + foreach my $repository(sort {$a->{priority} <=> $b->{priority}} @{$kiwi->{'repository'} || []}) { + my $kiwisource = ($repository->{'source'} || [])->[0]; + next if $kiwisource->{'path'} eq '/var/lib/empty'; # grr + die("bad path: $kiwisource->{'path'}\n") unless $kiwisource->{'path'} =~ /^obs:\/\/\/?([^\/]+)\/([^\/]+)\/?$/; + push @repos, "$1/$2"; + } } for my $packagegroup (@{$kiwi->{'packages'} || []}) { for my $package (@{$packagegroup->{'package'} || []}) { -- 2.7.4