Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at Tue Sep 6 18:16:47 CEST 2011.
-------- --- kiwi/kiwi.changes 2011-09-02 16:00:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/kiwi/kiwi.changes 2011-09-06 18:01:18.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Sep 6 16:00:43 UTC 2011 - [email protected] + +- temporary revert the repository priorization patch to unbreak + the multi arch repositories + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- temp_revert.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.xwWF7r/_old 2011-09-06 18:16:33.000000000 +0200 +++ /var/tmp/diff_new_pack.xwWF7r/_new 2011-09-06 18:16:33.000000000 +0200 @@ -70,13 +70,14 @@ %endif Summary: OpenSuSE - KIWI Image System Version: 4.95.4 -Release: 1 +Release: 3 Group: System/Management License: GPLv2 Source: %{name}.tar.bz2 Source1: %{name}-rpmlintrc Source2: %{name}-docu.tar.bz2 Source3: %{name}-repo.tar.bz2 +Patch: temp_revert.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} Recommends: jing @@ -326,6 +327,7 @@ %prep %setup -n %name -a2 -a3 +%patch -R -p1 %build # empty because of rpmlint warning rpm-buildroot-usage @@ -557,5 +559,4 @@ %endif - %changelog ++++++ temp_revert.diff ++++++ commit ce611d35662473365cebdc41172653d287bcaa0e Author: Adrian Schröter <[email protected]> Date: Wed Aug 31 16:29:44 2011 +0200 - priorize repositories over fallback architectures diff --git a/modules/KIWICollect.pm b/modules/KIWICollect.pm index 68b7d5a..abd8212 100644 --- a/modules/KIWICollect.pm +++ b/modules/KIWICollect.pm @@ -821,23 +821,23 @@ sub setupPackageFiles my @fallbacklist = ($requestedArch); if($nofallback==0 && $mode != 2) { - @fallbacklist = $this->{m_archlist}->fallbacks($requestedArch); + @fallbacklist = $this->{m_archlist}->fallbacks($requestedArch); @fallbacklist = ($requestedArch) unless @fallbacklist; $this->logMsg("I", " Look for fallbacks fallbacks") if $this->{m_debug} >= 6; } $this->logMsg("I", " Use as expanded architectures >".join(" ", @fallbacklist)."<") if $this->{m_debug} >= 5; my $fb_available = 0; - FA:foreach my $arch(@fallbacklist) { - $this->logMsg("I", " check architecture $arch ") if $this->{m_debug} >= 5; - PACKKEY:foreach my $packKey( sort{$poolPackages->{$a}->{priority} <=> $poolPackages->{$b}->{priority}} keys(%{$poolPackages})) { - # FIXME: check for forcerepo + PACKKEY:foreach my $packKey( sort{$poolPackages->{$a}->{priority} <=> $poolPackages->{$b}->{priority}} keys(%{$poolPackages})) { + FA:foreach my $arch(@fallbacklist) { + $this->logMsg("I", " check architecture $arch ") if $this->{m_debug} >= 5; + # FIXME: check for forcerepo $this->logMsg("I", " check $packKey ") if $this->{m_debug} >= 5; my $packPointer = $poolPackages->{$packKey}; if ( $packPointer->{arch} ne $arch ) { $this->logMsg("I", " => package $packName not available for arch $arch in repo $packKey") if $this->{m_debug} >= 4; - next PACKKEY; + next FA; } if($nofallback==0 && $mode != 2 && $this->{m_archlist}->arch($arch)) { my $follow = $this->{m_archlist}->arch($arch)->follower(); @@ -849,7 +849,7 @@ sub setupPackageFiles && ! defined( $packOptions->{requireVersion}->{$packPointer->{version}."-".$packPointer->{release}} ) ) { $this->logMsg("D", " => package ".$packName."-".$packPointer->{version}."-".$packPointer->{release}." not available for arch $arch in repo $packKey in this version") if $this->{m_debug} >= 4; - next PACKKEY; + next FA; } # Success, found a package ! my $medium = $packOptions->{'medium'} || 1; @@ -910,9 +910,9 @@ sub setupPackageFiles } next ARCH; # package processed, jump to the next request arch or package } - $this->logMsg("W", " => package $packName not available for arch $arch in any repo") if $this->{m_debug} >= 4; + $this->logMsg("W", " => package $packName not available for $requestedArch nor its fallbacks for repository $packKey") if $this->{m_debug} >= 4; } # /@fallbackarch - $this->logMsg("W", " => package $packName not available for $requestedArch nor its fallbacks") if $this->{m_debug} >= 1; + $this->logMsg("W", " => package $packName not available for arch $requestedArch in any repo") if $this->{m_debug} >= 1; push @missingPackages, $packName; } # /@archs } @@ -1112,11 +1112,11 @@ sub unpackMetapackages } $this->logMsg("I", " Use as expanded architectures >".join(" ", @fallbacklist)."<") if $this->{m_debug} >= 5; - FARCH:foreach my $arch(@fallbacklist) { - PACKKEY:foreach my $packKey( sort{$poolPackages->{$a}->{priority} <=> $poolPackages->{$b}->{priority}} keys(%{$poolPackages})) { + PACKKEY:foreach my $packKey( sort{$poolPackages->{$a}->{priority} <=> $poolPackages->{$b}->{priority}} keys(%{$poolPackages})) { + FARCH:foreach my $arch(@fallbacklist) { my $packPointer = $poolPackages->{$packKey}; - next PACKKEY if(!$packPointer->{'localfile'}); # should not be needed - next PACKKEY if($packPointer->{arch} ne $arch); + next FARCH if(!$packPointer->{'localfile'}); # should not be needed + next FARCH if($packPointer->{arch} ne $arch); $this->logMsg("I", "unpack $packPointer->{'localfile'} "); $this->{m_util}->unpac_package($packPointer->{'localfile'}, "$tmp"); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
