Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package product-builder-plugin-Tumbleweed
for openSUSE:Leap:15.3 checked in at 2021-04-16 10:38:48
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:15.3/product-builder-plugin-Tumbleweed (Old)
and
/work/SRC/openSUSE:Leap:15.3/.product-builder-plugin-Tumbleweed.new.12324 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "product-builder-plugin-Tumbleweed"
Fri Apr 16 10:38:48 2021 rev:3 rq:885725 version:1.3.1
Changes:
--------
---
/work/SRC/openSUSE:Leap:15.3/product-builder-plugin-Tumbleweed/product-builder-plugin-Tumbleweed.changes
2021-04-15 14:19:21.775850748 +0200
+++
/work/SRC/openSUSE:Leap:15.3/.product-builder-plugin-Tumbleweed.new.12324/product-builder-plugin-Tumbleweed.changes
2021-04-16 10:38:49.788831576 +0200
@@ -1,0 +2,12 @@
+Thu Apr 15 16:22:48 CEST 2021 - [email protected]
+
+- 1.3.1
+ * add option -g when calling add_product_susedata
+ to add gpg key ids as tags in repomd.xml (bsc#1184326)
+ * do not change the default install method in gfxboot.cfg
+ (bsc#1171018) Instead, just fill out the server & path
+ components in case the user wants to switch. The repo
+ location is already stored in the initrd in the
+ skelcd-installer-net-* packages.
+
+-------------------------------------------------------------------
Old:
----
product-builder-plugins-1.3.0.obscpio
New:
----
product-builder-plugins-1.3.1.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ product-builder-plugin-Tumbleweed.spec ++++++
--- /var/tmp/diff_new_pack.2JY7m5/_old 2021-04-16 10:38:50.084832070 +0200
+++ /var/tmp/diff_new_pack.2JY7m5/_new 2021-04-16 10:38:50.088832076 +0200
@@ -1,7 +1,7 @@
#
# spec file for package product-builder-plugin-Tumbleweed
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -20,7 +20,7 @@
Summary: openSUSE - KIWI Image System
License: GPL-2.0-or-later
Group: System/Management
-Version: 1.3.0
+Version: 1.3.1
Release: 0
Source: product-builder-plugins-%version.tar.xz
Provides: product-builder-plugin = %version-%release
++++++ _service ++++++
--- /var/tmp/diff_new_pack.2JY7m5/_old 2021-04-16 10:38:50.112832116 +0200
+++ /var/tmp/diff_new_pack.2JY7m5/_new 2021-04-16 10:38:50.112832116 +0200
@@ -5,8 +5,8 @@
<param name="revision">SLE_15</param>
-->
<param name="scm">git</param>
- <param name="version">1.3.0</param>
- <param name="revision">1.3.0</param>
+ <param name="version">1.3.1</param>
+ <param name="revision">1.3.1</param>
</service>
<service mode="disabled" name="set_version" />
<service mode="buildtime" name="tar"/>
++++++ product-builder-plugins-1.3.0.obscpio ->
product-builder-plugins-1.3.1.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/product-builder-plugins-1.3.0/KIWIDescrPlugin.pm
new/product-builder-plugins-1.3.1/KIWIDescrPlugin.pm
--- old/product-builder-plugins-1.3.0/KIWIDescrPlugin.pm 2020-04-24
14:45:54.000000000 +0200
+++ new/product-builder-plugins-1.3.1/KIWIDescrPlugin.pm 2021-04-15
16:10:51.000000000 +0200
@@ -231,6 +231,7 @@
$kwdfile =~ s/\.(?:kiwi|xml)$/.kwd/;
$cmd = "/usr/bin/add_product_susedata";
$cmd .= " -u"; # unique filenames
+ $cmd .= " -g"; # add gpg key ids as tags
$cmd .= " -k $kwdfile";
$cmd .= " -p"; # add diskusage data
$cmd .= " -e /usr/share/doc/packages/eulas";
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/product-builder-plugins-1.3.0/KIWIMiniIsoPlugin.pm
new/product-builder-plugins-1.3.1/KIWIMiniIsoPlugin.pm
--- old/product-builder-plugins-1.3.0/KIWIMiniIsoPlugin.pm 2020-04-24
14:45:54.000000000 +0200
+++ new/product-builder-plugins-1.3.1/KIWIMiniIsoPlugin.pm 2021-04-15
16:10:51.000000000 +0200
@@ -112,7 +112,7 @@
"<REPO_LOCATION> is unset, boot protocol will be set to 'slp'!"
);
} else {
- if ($repoloc =~ m{^http://([^/]+)/(.+)}x) {
+ if ($repoloc =~ m{^https?://([^/]+)/(.+)}x) {
($srv, $path) = ($1, $2);
}
if(not defined($srv) or not defined($path)) {
@@ -198,13 +198,8 @@
$ihp = $i;
}
}
- if(!$repoloc) {
- if($install == -1) {
- push @lines, "install=slp";
- } else {
- $lines[$install] =~ s{^install.*}{install=slp}x;
- }
- } elsif($srv) {
+ if($srv) {
+ # store the repo location but don't change the default install
method
if($ihs == -1) {
push @lines, "install.http.server=$srv";
} else {
@@ -215,11 +210,6 @@
} else {
$lines[$ihp] =~ s{^(install.http.path).*}{$1=$path}x;
}
- if($install == -1) {
- push @lines, "install=http";
- } else {
- $lines[$install] =~ s{^install.*}{install=http}x;
- }
}
unlink $cfg;
if (! $F -> open(">$cfg")) {
++++++ product-builder-plugins.obsinfo ++++++
--- /var/tmp/diff_new_pack.2JY7m5/_old 2021-04-16 10:38:50.196832256 +0200
+++ /var/tmp/diff_new_pack.2JY7m5/_new 2021-04-16 10:38:50.196832256 +0200
@@ -1,5 +1,5 @@
name: product-builder-plugins
-version: 1.3.0
-mtime: 1587732354
-commit: a39688ba570d6ec4a4d8c7eb9dbe2a850eed05f9
+version: 1.3.1
+mtime: 1618495851
+commit: 76bfae98ffd054182439ee7802e0f10f5108e5a3
