Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package product-builder for openSUSE:Factory checked in at 2021-07-02 13:26:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/product-builder (Old) and /work/SRC/openSUSE:Factory/.product-builder.new.2625 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "product-builder" Fri Jul 2 13:26:28 2021 rev:36 rq:902771 version:1.3.4 Changes: -------- --- /work/SRC/openSUSE:Factory/product-builder/product-builder.changes 2021-03-16 15:44:16.653025004 +0100 +++ /work/SRC/openSUSE:Factory/.product-builder.new.2625/product-builder.changes 2021-07-02 13:26:41.337122838 +0200 @@ -1,0 +2,7 @@ +Mon Jun 28 08:47:58 UTC 2021 - Adrian Schr��ter <adrian@suse.de> + +- 1.3.4 + * fix collecting of source rpms when multiple different + binary versions were used + +------------------------------------------------------------------- Old: ---- product-builder-1.3.3.obscpio New: ---- product-builder-1.3.4.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ product-builder.spec ++++++ --- /var/tmp/diff_new_pack.5ns4Wi/_old 2021-07-02 13:26:41.769119486 +0200 +++ /var/tmp/diff_new_pack.5ns4Wi/_new 2021-07-02 13:26:41.769119486 +0200 @@ -23,7 +23,7 @@ Name: product-builder Conflicts: kiwi Conflicts: kiwi-instsource -Version: 1.3.3 +Version: 1.3.4 Release: 0 Provides: kiwi-schema = 6.2 Source: product-builder-%version.tar.xz ++++++ _service ++++++ --- /var/tmp/diff_new_pack.5ns4Wi/_old 2021-07-02 13:26:41.797119269 +0200 +++ /var/tmp/diff_new_pack.5ns4Wi/_new 2021-07-02 13:26:41.797119269 +0200 @@ -1,8 +1,8 @@ <services> <service name="obs_scm" mode="manual"> <param name="url">https://github.com/openSUSE/product-builder.git</param> - <param name="revision">1.3.3</param> - <param name="version">1.3.3</param> + <param name="revision">1.3.4</param> + <param name="version">1.3.4</param> <param name="scm">git</param> <param name="extract">rpm/product-builder.spec</param> </service> ++++++ product-builder-1.3.3.obscpio -> product-builder-1.3.4.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/product-builder-1.3.3/.gitignore new/product-builder-1.3.4/.gitignore --- old/product-builder-1.3.3/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/product-builder-1.3.4/.gitignore 2021-06-28 10:44:13.000000000 +0200 @@ -0,0 +1,10 @@ +# emacs backup files +\#*# +.#* +*~ +# hidden temporary files +.tmp.* +# kiwirc file created if kiwi is called from git checkout +.kiwirc +# revision file created for packaging or if called from git checkout +.revision diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/product-builder-1.3.3/modules/KIWICollect.pm new/product-builder-1.3.4/modules/KIWICollect.pm --- old/product-builder-1.3.3/modules/KIWICollect.pm 2021-03-15 13:23:44.000000000 +0100 +++ new/product-builder-1.3.4/modules/KIWICollect.pm 2021-06-28 10:44:13.000000000 +0200 @@ -997,49 +997,49 @@ . '<'; $this->logMsg('I', $msg); } + my %require_version = %{$packOptions->{requireVersion} || {}}; my $fb_available = 0; - PACKKEY: - for my $packKey( sort { - $poolPackages->{$a}->{priority} - <=> $poolPackages->{$b}->{priority} - || indexOfArray($poolPackages->{$a}->{arch}, \@fallbacklist) - <=> indexOfArray($poolPackages->{$b}->{arch}, \@fallbacklist) - } keys(%{$poolPackages}) - ) { + PACKKEY: + for my $packKey( sort { + $poolPackages->{$a}->{priority} + <=> $poolPackages->{$b}->{priority} + || indexOfArray($poolPackages->{$a}->{arch}, \@fallbacklist) + <=> indexOfArray($poolPackages->{$b}->{arch}, \@fallbacklist) + } keys(%{$poolPackages}) + ) { + if ($this->{m_debug} >= 5) { + $this->logMsg('I', " check $packKey "); + } + + my $arch; + my $packPointer = $poolPackages->{$packKey}; + for my $checkarch(@fallbacklist) { if ($this->{m_debug} >= 5) { - $this->logMsg('I', " check $packKey "); + $this->logMsg('I', " check architecture $checkarch "); } - - my $arch; - my $packPointer = $poolPackages->{$packKey}; - for my $checkarch(@fallbacklist) { - if ($this->{m_debug} >= 5) { - $this->logMsg('I', " check architecture $checkarch "); + # sort keys 1st by repository order and secondary by architecture priority + if ( $packPointer->{arch} ne $checkarch ) { + if ($this->{m_debug} >= 4) { + my $msg = " => package $packName not available " + ."for arch $checkarch in repo $packKey"; + $this->logMsg('I', $msg); } - # sort keys 1st by repository order and secondary by architecture priority - if ( $packPointer->{arch} ne $checkarch ) { + next; + } + if ($nofallback==0 + && $mode != 2 && $this->{m_archlist}->arch($checkarch)) { + my $follow = $this->{m_archlist}->arch($checkarch)->follower(); + if( defined $follow ) { if ($this->{m_debug} >= 4) { - my $msg = " => package $packName not available " - ."for arch $checkarch in repo $packKey"; + my $msg = " => falling back to $follow " + . "from $packKey instead"; $this->logMsg('I', $msg); } - next; } - if ($nofallback==0 - && $mode != 2 && $this->{m_archlist}->arch($checkarch)) { - my $follow = $this->{m_archlist}->arch($checkarch)->follower(); - if( defined $follow ) { - if ($this->{m_debug} >= 4) { - my $msg = " => falling back to $follow " - . "from $packKey instead"; - $this->logMsg('I', $msg); - } - } - } - if ( scalar(keys %{$packOptions->{requireVersion}}) > 0 - && ! defined($packOptions->{requireVersion}->{$packPointer->{version} - ."-".$packPointer->{release}}) ) { - if ($this->{m_debug} >= 4) { + } + if (%require_version) { + if (!defined($require_version{$packPointer->{version}."-".$packPointer->{release}})) { + if ($this->{m_debug} >= 4) { my $msg = " => package " .$packName .'-' @@ -1049,8 +1049,10 @@ ." not available for arch $checkarch in " ."repo $packKey in this version"; $this->logMsg('D', $msg); - } - next; + } + next; + } + delete $require_version{$packPointer->{version}."-".$packPointer->{release}}; } # Success, found a package ! $arch = $checkarch; @@ -1160,7 +1162,7 @@ } # package processed, jump to the next request arch or package - next ARCH; + next ARCH unless %require_version; } # /FARCH if ($this->{m_debug} >= 1) { my $msg = " => package $packName not available for " ++++++ product-builder.obsinfo ++++++ --- /var/tmp/diff_new_pack.5ns4Wi/_old 2021-07-02 13:26:41.961117996 +0200 +++ /var/tmp/diff_new_pack.5ns4Wi/_new 2021-07-02 13:26:41.965117965 +0200 @@ -1,5 +1,5 @@ name: product-builder -version: 1.3.3 -mtime: 1615811024 -commit: 52509a6375ae663e93d0997085a969dcada02b36 +version: 1.3.4 +mtime: 1624869853 +commit: 78fdc0f5a15e81a788aa1b142d4507cb6a8845bd