Hello community,
here is the log from the commit of package product-builder for
openSUSE:Leap:15.2 checked in at 2020-03-01 08:51:12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:15.2/product-builder (Old)
and /work/SRC/openSUSE:Leap:15.2/.product-builder.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "product-builder"
Sun Mar 1 08:51:12 2020 rev:76 rq:779657 version:1.2.8
Changes:
--------
--- /work/SRC/openSUSE:Leap:15.2/product-builder/product-builder.changes
2020-02-16 18:25:43.754636606 +0100
+++
/work/SRC/openSUSE:Leap:15.2/.product-builder.new.26092/product-builder.changes
2020-03-01 08:51:32.729293731 +0100
@@ -1,0 +2,6 @@
+Wed Feb 26 13:23:16 UTC 2020 - Adrian Schröter <[email protected]>
+
+- 1.2.8
+ * keep kwd file in SLE Full media wrapper (bsc#1164670)
+
+-------------------------------------------------------------------
Old:
----
product-builder-1.2.7.obscpio
New:
----
product-builder-1.2.8.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ product-builder.spec ++++++
--- /var/tmp/diff_new_pack.Z1I8ZH/_old 2020-03-01 08:51:33.281294829 +0100
+++ /var/tmp/diff_new_pack.Z1I8ZH/_new 2020-03-01 08:51:33.281294829 +0100
@@ -1,7 +1,7 @@
#
# spec file for package product-builder
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,11 +19,11 @@
Summary: SUSE Product Builder
License: GPL-2.0-only
Group: System/Management
-Url: http://github.com/openSUSE/product-builder
+URL: http://github.com/openSUSE/product-builder
Name: product-builder
Conflicts: kiwi
Conflicts: kiwi-instsource
-Version: 1.2.7
+Version: 1.2.8
Release: 0
Provides: kiwi-schema = 6.2
Source: product-builder-%version.tar.xz
++++++ _service ++++++
--- /var/tmp/diff_new_pack.Z1I8ZH/_old 2020-03-01 08:51:33.309294885 +0100
+++ /var/tmp/diff_new_pack.Z1I8ZH/_new 2020-03-01 08:51:33.309294885 +0100
@@ -1,8 +1,8 @@
<services>
<service name="obs_scm" mode="disabled">
<param name="url">https://github.com/openSUSE/product-builder.git</param>
- <param name="revision">1.2.7</param>
- <param name="version">1.2.7</param>
+ <param name="revision">1.2.8</param>
+ <param name="version">1.2.8</param>
<param name="scm">git</param>
<param name="extract">rpm/product-builder.spec</param>
</service>
++++++ product-builder-1.2.7.obscpio -> product-builder-1.2.8.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/product-builder-1.2.7/SLE-wrapper.sh
new/product-builder-1.2.8/SLE-wrapper.sh
--- old/product-builder-1.2.7/SLE-wrapper.sh 2020-02-05 13:05:47.000000000
+0100
+++ new/product-builder-1.2.8/SLE-wrapper.sh 2020-02-26 14:21:02.000000000
+0100
@@ -11,7 +11,7 @@
mkdir $TOPDIR/KIWIRESULTS
# remove symlink, we cat into it
- rm config.xml
+ rm -f config.xml config.kiwi
ARCH=${BUILD_FLAVOR/SLES-cd-Full-}
# the worker expands obsrepositories:// only in the target kiwi so we need
to apply this change to the modules
@@ -30,8 +30,11 @@
grep -qx $MN_SHORT packages-dvd.txt || continue
# replace obsrepositories://
- perl -e '$in=0; while (<STDIN>) { $in=1 if /<instrepo /; print $_ unless
$in; if (m,</instrepo,) { $in=0; system("cat expanded_instsources.include") };
}' < $kiwi > config.xml
- sed -i
"s,MEDIUM_NAME\">.*,MEDIUM_NAME\">$MN-$BUILD_SUFFIX-Media</productvar><productvar
name=\"BUILD_ID\">$MN-$BUILD_SUFFIX</productvar>," config.xml
+ perl -e '$in=0; while (<STDIN>) { $in=1 if /<instrepo /; print $_ unless
$in; if (m,</instrepo,) { $in=0; system("cat expanded_instsources.include") };
}' < $kiwi > config.kiwi
+ sed -i
"s,MEDIUM_NAME\">.*,MEDIUM_NAME\">$MN-$BUILD_SUFFIX-Media</productvar><productvar
name=\"BUILD_ID\">$MN-$BUILD_SUFFIX</productvar>," config.kiwi
+
+ # rescue support flags
+ cp ${kiwi%.kiwi}.kwd config.kwd
/usr/bin/product-builder.pl --root $TOPDIR/KIWIROOT/ -v 1 --logfile
terminal --create-instsource . || exit 1
mv $TOPDIR/KIWIROOT/main $TOPDIR/KIWIALL/$MN_SHORT
@@ -39,7 +42,7 @@
done # kiwiconf
# now the final ISO
- perl -e '$in=0; while (<STDIN>) { $in=0 if m,</repopackages,; print $_
unless $in; $in=1 if m,<repopackages,; }' < $BUILD_FLAVOR.kiwi > config.xml
+ perl -e '$in=0; while (<STDIN>) { $in=0 if m,</repopackages,; print $_
unless $in; $in=1 if m,<repopackages,; }' < $BUILD_FLAVOR.kiwi > config.kiwi
;;
esac
++++++ product-builder.obsinfo ++++++
--- /var/tmp/diff_new_pack.Z1I8ZH/_old 2020-03-01 08:51:33.493295251 +0100
+++ /var/tmp/diff_new_pack.Z1I8ZH/_new 2020-03-01 08:51:33.497295259 +0100
@@ -1,5 +1,5 @@
name: product-builder
-version: 1.2.7
-mtime: 1580904347
-commit: 2fa0d07906bffbde3df7cef265301ecd08d85027
+version: 1.2.8
+mtime: 1582723262
+commit: 341d31d4b6c311cbc6544d7284e9957033542247
