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-09-30 23:43:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/product-builder (Old)
and /work/SRC/openSUSE:Factory/.product-builder.new.2443 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "product-builder"
Thu Sep 30 23:43:02 2021 rev:41 rq:921794 version:1.4.6
Changes:
--------
--- /work/SRC/openSUSE:Factory/product-builder/product-builder.changes
2021-09-20 23:32:09.915100347 +0200
+++
/work/SRC/openSUSE:Factory/.product-builder.new.2443/product-builder.changes
2021-09-30 23:43:35.500482865 +0200
@@ -1,0 +2,6 @@
+Mon Sep 27 13:02:28 UTC 2021 - Adrian Schr??ter <adr...@suse.de>
+
+- 1.4.6
+ * fixed package tracking regression
+
+-------------------------------------------------------------------
Old:
----
product-builder-1.4.4.obscpio
New:
----
product-builder-1.4.6.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ product-builder.spec ++++++
--- /var/tmp/diff_new_pack.JOpgxv/_old 2021-09-30 23:43:35.980483415 +0200
+++ /var/tmp/diff_new_pack.JOpgxv/_new 2021-09-30 23:43:35.980483415 +0200
@@ -23,7 +23,7 @@
Name: product-builder
Conflicts: kiwi
Conflicts: kiwi-instsource
-Version: 1.4.4
+Version: 1.4.6
Release: 0
Provides: kiwi-schema = 6.2
Source: product-builder-%version.tar.xz
++++++ _service ++++++
--- /var/tmp/diff_new_pack.JOpgxv/_old 2021-09-30 23:43:36.004483442 +0200
+++ /var/tmp/diff_new_pack.JOpgxv/_new 2021-09-30 23:43:36.008483447 +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.4.4</param>
- <param name="version">1.4.4</param>
+ <param name="revision">1.4.6</param>
+ <param name="version">1.4.6</param>
<param name="scm">git</param>
<param name="extract">rpm/product-builder.spec</param>
</service>
++++++ product-builder-1.4.4.obscpio -> product-builder-1.4.6.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/product-builder-1.4.4/modules/KIWICollect.pm
new/product-builder-1.4.6/modules/KIWICollect.pm
--- old/product-builder-1.4.4/modules/KIWICollect.pm 2021-09-10
16:14:55.000000000 +0200
+++ new/product-builder-1.4.6/modules/KIWICollect.pm 2021-09-20
15:12:29.000000000 +0200
@@ -81,8 +81,6 @@
# (...)
# m_sourcePacks:
# source rpms, which are refered from m_repoPacks
- # m_modularityPacks:
- # to trace variants in all modules of a package
# m_debugPacks:
# debug rpms, which are refered from m_repoPacks
# m_srcmedium:
@@ -105,7 +103,6 @@
m_logger => undef,
m_packagePool => undef,
m_repoPacks => undef,
- m_modularityPacks => undef,
m_sourcePacks => undef,
m_debugPacks => undef,
m_metaPacks => undef,
@@ -1019,6 +1016,11 @@
} keys(%{$poolPackages});
}
+ # marks a found package (modularity packages can fullfill
requirements as well, but main package
+ # need to get added in addition in any case)
+ my $found_package;
+ my $found_modularity_package;
+
PACKKEY:
for my $packKey(@sorted_keys) {
# the packKey makes the packages unique where necessary
@@ -1027,6 +1029,8 @@
$this->logMsg('I', " check $packKey ");
}
+ next if ($found_package && !%require_version);
+
my $arch;
my $packPointer = $poolPackages->{$packKey};
for my $checkarch(@fallbacklist) {
@@ -1078,9 +1082,6 @@
}
next unless defined $arch;
- # check for modularity variants
- my %require_modularity =
%{$this->{m_modularityPacks}->{$packName."@".$arch} || {}};
-
# process package
my $medium = $packOptions->{'medium'} || 1;
$packOptions->{$requestedArch}->{'newfile'} =
@@ -1184,9 +1185,15 @@
}
}
- # package processed, jump to the next request arch or package
- next ARCH unless %require_version || %require_modularity;
+ if ($packPointer->{modularity_context}) {
+ $found_modularity_package = 1;
+ } else {
+ $found_package = 1;
+ }
} # /PACKKEY
+ # package processed, jump to the next request arch or package
+ next if ($found_package || $found_modularity_package) &&
!%require_version;
+
my $msg = "$packName not available for "
. "$requestedArch nor its fallbacks";
$msg .= " in version ".(keys(%require_version))[0]." by package
".(values(%require_version))[0] if %require_version;
@@ -1876,8 +1883,7 @@
# directory structure up.
my $package;
$package->{'arch'} = $arch;
-# $package->{'repo'} = $this->{m_repos}->{$r};
-# $package->{'repo'}->{'srcdirs'} = {} if $package->{'repo'};
+ $package->{'repo'} = $this->{m_repos}->{$r};
$package->{'localfile'} = $uri;
$package->{'disturl'} = $flags{'DISTURL'}[0];
$package->{'license'} = $flags{'LICENSE'}[0];
@@ -1902,6 +1908,13 @@
. "@"
. $package->{'release'};
}
+ # is it a module package?
+ if( $flags{'5096'} ) {
+ my @e = split(':', $flags{'5096'}[0]);
+ # strip version, but take module name, stream, context
+ $package->{'modularity_context'} = "$e[0]:$e[1]:$e[3]";
+ $repokey .= "_".$package->{'modularity_context'};
+ }
if ( $packPool->{$name}->{$repokey} ) {
# we have it already in same repo
# is this one newer?
@@ -1913,14 +1926,6 @@
my $srcname = $flags{'SOURCERPM'}[0];
$package->{'sourcepackage'} = $srcname if ($srcname);
}
- # is it a module package?
- if( $flags{'5096'} ) {
- my @e = split(':', $flags{'5096'}[0]);
- # strip version, but take module name, stream, context
- $package->{'modularity_context'} =
"${e[0]}:${e[1]}:${e[3]}";
- $repokey .= "_".$package->{'modularity_context'};
-
$this->{m_modularityPacks}->{$name."@".$arch}->{$package->{modularity_context}}
= 1;
- }
# store the result.
my $store;
if($packPool->{$name}) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/product-builder-1.4.4/modules/KIWIGlobals.pm
new/product-builder-1.4.6/modules/KIWIGlobals.pm
--- old/product-builder-1.4.4/modules/KIWIGlobals.pm 2021-09-10
16:14:55.000000000 +0200
+++ new/product-builder-1.4.6/modules/KIWIGlobals.pm 2021-09-20
15:12:29.000000000 +0200
@@ -59,8 +59,8 @@
#------------------------------------------
my %data;
$data{Version} = "1.01.01";
- $data{Publisher} = "SUSE LINUX GmbH";
- $data{Preparer} = "KIWI - http://opensuse.github.com/kiwi";;
+ $data{Publisher} = "SUSE LLC";
+ $data{Preparer} = "Product Builder -
http://www.github.com/openSUSE/product-builder";;
$data{ConfigName} = "config.xml";
$data{PackageManager} = "zypper";
#============================================
++++++ product-builder.obsinfo ++++++
--- /var/tmp/diff_new_pack.JOpgxv/_old 2021-09-30 23:43:36.144483603 +0200
+++ /var/tmp/diff_new_pack.JOpgxv/_new 2021-09-30 23:43:36.148483607 +0200
@@ -1,5 +1,5 @@
name: product-builder
-version: 1.4.4
-mtime: 1631283295
-commit: 82cd0d89cbb0957a2031e3317f6d88c8384f5ea9
+version: 1.4.6
+mtime: 1632143549
+commit: 8fb531cf6023254d7809be93064b2d60952923b6
