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 2023-07-30 20:57:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/product-builder (Old)
and /work/SRC/openSUSE:Factory/.product-builder.new.32662 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "product-builder"
Sun Jul 30 20:57:18 2023 rev:44 rq:1101100 version:1.4.14
Changes:
--------
--- /work/SRC/openSUSE:Factory/product-builder/product-builder.changes
2023-03-26 20:19:14.270970813 +0200
+++
/work/SRC/openSUSE:Factory/.product-builder.new.32662/product-builder.changes
2023-07-30 20:57:20.831068375 +0200
@@ -1,0 +2,9 @@
+Thu Jul 27 14:38:16 UTC 2023 - Adrian Schröter <[email protected]>
+
+- 1.4.14
+ * Introduce DOWNLOAD_MIRROR_POLICY option, enabled by default!
+ => can lead to build failures on inconsistent package build
+ states
+ * Joliet format only on main medium
+
+-------------------------------------------------------------------
Old:
----
product-builder-1.4.13.obscpio
New:
----
product-builder-1.4.14.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ product-builder.spec ++++++
--- /var/tmp/diff_new_pack.11Fr1a/_old 2023-07-30 20:57:22.267076900 +0200
+++ /var/tmp/diff_new_pack.11Fr1a/_new 2023-07-30 20:57:22.311077162 +0200
@@ -23,7 +23,7 @@
Name: product-builder
Conflicts: kiwi
Conflicts: kiwi-instsource
-Version: 1.4.13
+Version: 1.4.14
Release: 0
Provides: kiwi-schema = 6.2
Source: product-builder-%version.tar.xz
++++++ _service ++++++
--- /var/tmp/diff_new_pack.11Fr1a/_old 2023-07-30 20:57:22.627079038 +0200
+++ /var/tmp/diff_new_pack.11Fr1a/_new 2023-07-30 20:57:22.663079252 +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.13</param>
- <param name="version">1.4.13</param>
+ <param name="revision">1.4.14</param>
+ <param name="version">1.4.14</param>
<param name="scm">git</param>
<param name="extract">rpm/product-builder.spec</param>
</service>
++++++ product-builder-1.4.13.obscpio -> product-builder-1.4.14.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/product-builder-1.4.13/modules/KIWICollect.pm
new/product-builder-1.4.14/modules/KIWICollect.pm
--- old/product-builder-1.4.13/modules/KIWICollect.pm 2023-03-24
13:51:19.000000000 +0100
+++ new/product-builder-1.4.14/modules/KIWICollect.pm 2023-07-27
16:59:21.000000000 +0200
@@ -782,8 +782,12 @@
my $attr = "-r"; # RockRidge
$attr .= " -pad"; # pad image by 150 sectors - needed for Linux
$attr .= " -f"; # follow symlinks - really necessary?
- $attr .= " -J"; # Joilet extensions - only useful for i586/x86_64,
- $attr .= " -joliet-long"; # longer filenames for joilet filenames
+ if ($cd == 1) {
+ # Joliet only for main medium.
+ # The .slsa_provenance files may trigger file name limits on iso
generation
+ $attr .= " -J"; # Joilet extensions - only useful for i586/x86_64,
+ $attr .= " -joliet-long"; # longer filenames for joilet filenames
+ }
$attr .= " -p \"$this->{gdata}->{Preparer}\"";
$attr .= " -publisher \"$this->{gdata}->{Publisher}\"";
$attr .= " -A \"$name\"";
@@ -1230,9 +1234,7 @@
}
my $opt = 'IGNORE_MISSING_REPO_PACKAGES';
my $val = $this->{m_proddata}->getOpt($opt);
- unless ($val eq "true") {
- $this->logMsg('E', "Required packages were not found");
- }
+ $this->logMsg('E', "Required packages were not found") unless $val &&
$val eq "true";
}
return $retval;
}
@@ -1823,6 +1825,7 @@
my $num_repos = keys %{$this->{m_repos}};
my $count_repos = 0;
my $last_progress_time = 0;
+ my $download_mirror_policy =
$this->{m_proddata}->getOpt('DOWNLOAD_MIRROR_POLICY');
REPO:
for my $r (
sort {
@@ -1943,8 +1946,14 @@
}
if ( $packPool->{$name}->{$repokey} ) {
# we have it already in same repo
- # is this one newer?
- next if verscmp($packPool->{$name}->{$repokey},
$package) > 0;
+ # is this one older?
+ if (verscmp($packPool->{$name}->{$repokey}, $package)
> 0) {
+ if ($download_mirror_policy ne "false") {
+ # Abort to avoid changing files with same
location.
+ $this->logMsg('E', "Same package name in one
repository with different versions: $name\nNot allowed by
DOWNLOAD_MIRROR_POLICY\n");
+ };
+ next;
+ }
}
# collect data for connected source rpm
if( $flags{'SOURCERPM'} ) {
++++++ product-builder.obsinfo ++++++
--- /var/tmp/diff_new_pack.11Fr1a/_old 2023-07-30 20:57:23.323083170 +0200
+++ /var/tmp/diff_new_pack.11Fr1a/_new 2023-07-30 20:57:23.363083408 +0200
@@ -1,5 +1,5 @@
name: product-builder
-version: 1.4.13
-mtime: 1679662279
-commit: a15501ef6c096ce21e6f7d82c28db36845a43331
+version: 1.4.14
+mtime: 1690469961
+commit: 9646b72160e44d318487bb8aab9113505fa7f592
