Hello community,
here is the log from the commit of package livecd-openSUSE for openSUSE:Factory
checked in at 2020-11-04 09:18:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/livecd-openSUSE (Old)
and /work/SRC/openSUSE:Factory/.livecd-openSUSE.new.11331 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "livecd-openSUSE"
Wed Nov 4 09:18:28 2020 rev:123 rq: version:unknown
Changes:
--------
--- /work/SRC/openSUSE:Factory/livecd-openSUSE/livecd-openSUSE.changes
2020-09-07 21:36:00.749399006 +0200
+++
/work/SRC/openSUSE:Factory/.livecd-openSUSE.new.11331/livecd-openSUSE.changes
2020-11-04 09:18:31.082551715 +0100
@@ -1,0 +2,14 @@
+Wed Nov 4 08:17:48 UTC 2020 - Dominique Leuenberger <[email protected]>
+
+- Block systemd-doc from all flavors, not only xfce.
+
+-------------------------------------------------------------------
+Fri Oct 30 10:10:31 UTC 2020 - Dominique Leuenberger <[email protected]>
+
+- Do only use set -u: set -e causes issues with stepping out of the
+ for loop using continue.
+- Skip the for loop early: no reason to calculate the PACKAGES list
+ and then not consume it.
+- Use tr [:lower:] [:upper:] instead of tr a-z A-Z.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ livecd-leap-gnome.kiwi ++++++
--- /var/tmp/diff_new_pack.QHNGVK/_old 2020-11-04 09:18:32.634548453 +0100
+++ /var/tmp/diff_new_pack.QHNGVK/_new 2020-11-04 09:18:32.638548444 +0100
@@ -296,6 +296,8 @@
<ignore name="yast2-sudo"/>
<package name="aaa_base" replaces="systemd-coredump"/>
<ignore name="systemd-coredump"/>
+ <package name="aaa_base" replaces="systemd-doc"/>
+ <ignore name="systemd-doc"/>
<package name="aaa_base" replaces="NetworkManager-vpnc-gnome"/>
<ignore name="NetworkManager-vpnc-gnome"/>
<package name="aaa_base" replaces="plasma-nm5-vpnc"/>
livecd-leap-kde.kiwi: same change
++++++ livecd-leap-x11.kiwi ++++++
--- /var/tmp/diff_new_pack.QHNGVK/_old 2020-11-04 09:18:32.674548368 +0100
+++ /var/tmp/diff_new_pack.QHNGVK/_new 2020-11-04 09:18:32.674548368 +0100
@@ -296,6 +296,8 @@
<ignore name="yast2-sudo"/>
<package name="aaa_base" replaces="systemd-coredump"/>
<ignore name="systemd-coredump"/>
+ <package name="aaa_base" replaces="systemd-doc"/>
+ <ignore name="systemd-doc"/>
<package name="aaa_base" replaces="NetworkManager-vpnc-gnome"/>
<ignore name="NetworkManager-vpnc-gnome"/>
<package name="aaa_base" replaces="plasma-nm5-vpnc"/>
@@ -518,6 +520,8 @@
<ignore name="xfce4-power-manager-lang"/>
<package name="aaa_base" replaces="xorg-x11-fonts-legacy"/>
<ignore name="xorg-x11-fonts-legacy"/>
+ <package name="aaa_base" replaces="noto-sans-cjk-fonts"/>
+ <ignore name="noto-sans-cjk-fonts"/>
<package name="aaa_base" replaces="cyrus-sasl"/>
<ignore name="cyrus-sasl"/>
<package name="aaa_base" replaces="deltarpm"/>
++++++ livecd-tumbleweed-gnome.kiwi ++++++
--- /var/tmp/diff_new_pack.QHNGVK/_old 2020-11-04 09:18:32.706548301 +0100
+++ /var/tmp/diff_new_pack.QHNGVK/_new 2020-11-04 09:18:32.706548301 +0100
@@ -296,6 +296,8 @@
<ignore name="yast2-sudo"/>
<package name="aaa_base" replaces="systemd-coredump"/>
<ignore name="systemd-coredump"/>
+ <package name="aaa_base" replaces="systemd-doc"/>
+ <ignore name="systemd-doc"/>
<package name="aaa_base" replaces="NetworkManager-vpnc-gnome"/>
<ignore name="NetworkManager-vpnc-gnome"/>
<package name="aaa_base" replaces="plasma-nm5-vpnc"/>
livecd-tumbleweed-kde.kiwi: same change
++++++ livecd-tumbleweed-x11.kiwi ++++++
--- /var/tmp/diff_new_pack.QHNGVK/_old 2020-11-04 09:18:32.746548217 +0100
+++ /var/tmp/diff_new_pack.QHNGVK/_new 2020-11-04 09:18:32.746548217 +0100
@@ -69,8 +69,6 @@
<ignore name="gimp-help"/>
<package name="aaa_base" replaces="libreoffice-base"/>
<ignore name="libreoffice-base"/>
- <package name="aaa_base" replaces="noto-sans-cjk-fonts"/>
- <ignore name="noto-sans-cjk-fonts"/>
<package name="aaa_base" replaces="libreoffice-mailmerge"/>
<ignore name="libreoffice-mailmerge"/>
<package name="aaa_base" replaces="libreoffice-math"/>
@@ -298,6 +296,8 @@
<ignore name="yast2-sudo"/>
<package name="aaa_base" replaces="systemd-coredump"/>
<ignore name="systemd-coredump"/>
+ <package name="aaa_base" replaces="systemd-doc"/>
+ <ignore name="systemd-doc"/>
<package name="aaa_base" replaces="NetworkManager-vpnc-gnome"/>
<ignore name="NetworkManager-vpnc-gnome"/>
<package name="aaa_base" replaces="plasma-nm5-vpnc"/>
@@ -514,6 +514,8 @@
<ignore name="xfce4-power-manager-lang"/>
<package name="aaa_base" replaces="xorg-x11-fonts-legacy"/>
<ignore name="xorg-x11-fonts-legacy"/>
+ <package name="aaa_base" replaces="noto-sans-cjk-fonts"/>
+ <ignore name="noto-sans-cjk-fonts"/>
<package name="aaa_base" replaces="cyrus-sasl"/>
<ignore name="cyrus-sasl"/>
<package name="aaa_base" replaces="deltarpm"/>
++++++ livecd-tumbleweed-xfce.kiwi ++++++
--- /var/tmp/diff_new_pack.QHNGVK/_old 2020-11-04 09:18:32.774548158 +0100
+++ /var/tmp/diff_new_pack.QHNGVK/_new 2020-11-04 09:18:32.774548158 +0100
@@ -298,8 +298,6 @@
<ignore name="systemd-coredump"/>
<package name="aaa_base" replaces="systemd-doc"/>
<ignore name="systemd-doc"/>
- <package name="aaa_base" replaces="engrampa-lang"/>
- <ignore name="engrampa-lang"/>
<package name="aaa_base" replaces="NetworkManager-vpnc-gnome"/>
<ignore name="NetworkManager-vpnc-gnome"/>
<package name="aaa_base" replaces="plasma-nm5-vpnc"/>
@@ -441,6 +439,8 @@
<ignore name="xfce4-panel-plugin-xkb"/>
<package name="aaa_base" replaces="xfce4-panel-plugin-notes"/>
<ignore name="xfce4-panel-plugin-notes"/>
+ <package name="aaa_base" replaces="engrampa-lang"/>
+ <ignore name="engrampa-lang"/>
<package name="aaa_base" replaces="libreoffice"/>
<ignore name="libreoffice"/>
<package name="aaa_base" replaces="simple-scan"/>
++++++ list-common.sh ++++++
--- /var/tmp/diff_new_pack.QHNGVK/_old 2020-11-04 09:18:32.866547965 +0100
+++ /var/tmp/diff_new_pack.QHNGVK/_new 2020-11-04 09:18:32.866547965 +0100
@@ -164,6 +164,7 @@
# systemd-coredump makes no sense on a live image: there are no debuginfo
installed
buildignore systemd-coredump
+buildignore systemd-doc
# VPNC is no longer
buildignore NetworkManager-vpnc-gnome
++++++ list-xfce.sh ++++++
--- /var/tmp/diff_new_pack.QHNGVK/_old 2020-11-04 09:18:32.942547805 +0100
+++ /var/tmp/diff_new_pack.QHNGVK/_new 2020-11-04 09:18:32.942547805 +0100
@@ -24,7 +24,6 @@
# Remove useless xfce panel plugins
buildignore xfce4-panel-plugin-xkb
buildignore xfce4-panel-plugin-notes
-buildignore systemd-doc
buildignore engrampa-lang
# Remove Libreoffice as it's too big
++++++ pre-checkin.sh ++++++
--- /var/tmp/diff_new_pack.QHNGVK/_old 2020-11-04 09:18:32.986547712 +0100
+++ /var/tmp/diff_new_pack.QHNGVK/_new 2020-11-04 09:18:32.990547704 +0100
@@ -1,5 +1,5 @@
#!/bin/sh
-set -eu
+set -u
install() {
if [ -n "${2-}" ]; then
@@ -42,7 +42,8 @@
fi
for flavor in gnome kde xfce x11; do
- uppercaseflavor="$(echo "${flavor}" | tr a-z A-Z)"
+ [ "${flavor}" = "xfce" -a "${distro}" = "leap" ] && continue #
Prevent creation of livecd-leap-xfce.kiwi
+ uppercaseflavor="$(echo "${flavor}" | tr [:lower:] [:upper:])"
if [ "${flavor}" = "x11" ]; then
name="${distroname} Rescue CD"
@@ -55,7 +56,6 @@
PACKAGES="$PACKAGES\n\n <!-- list-${flavor}.sh -->"
. "$PWD/list-${flavor}.sh"
- [ "${flavor}" = "xfce" -a "${distro}" = "leap" ] && continue #
Prevent creation of livecd-leap-xfce.kiwi
sed "s#@FLAVOR@#${flavor}#g;\
s#@NAME@#${name// /-}#g;\
s#@DISPLAYNAME@#${name}#g;\
