Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package live-langset-data for
openSUSE:Factory checked in at 2022-12-25 15:14:20
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/live-langset-data (Old)
and /work/SRC/openSUSE:Factory/.live-langset-data.new.1563 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "live-langset-data"
Sun Dec 25 15:14:20 2022 rev:19 rq:1045018 version:2.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/live-langset-data/live-langset-data.changes
2022-11-16 15:42:51.119720490 +0100
+++
/work/SRC/openSUSE:Factory/.live-langset-data.new.1563/live-langset-data.changes
2022-12-25 15:14:23.745217820 +0100
@@ -1,0 +2,6 @@
+Fri Dec 23 14:12:59 UTC 2022 - Fabian Vogt <[email protected]>
+
+- Handle missing files explicitly, particularly useful with empty
+ (unpopulated) /etc
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ langset.sh ++++++
--- /var/tmp/diff_new_pack.iZQTMv/_old 2022-12-25 15:14:26.345232535 +0100
+++ /var/tmp/diff_new_pack.iZQTMv/_new 2022-12-25 15:14:26.349232558 +0100
@@ -33,8 +33,13 @@
Language=$(echo "$lang" | cut -d_ -f1)
file="/usr/share/langset/$Language""_$Country"
-if ! test -f "$file"; then
- file="/usr/share/langset/$Language"
+if ! [ -f "$file" ]; then
+ file="/usr/share/langset/$Language"
+fi
+
+if ! [ -f "$file" ]; then
+ echo "Locale not found"
+ exit 1
fi
# Read all values of the langset data files
@@ -49,8 +54,9 @@
# set_vconsole_option KEY value
set_vconsole_option() {
- # This sed command exits with 1 if no substitution was done
- sed -i"" -E "/^$1=.*\$/,\${s//$1=$2/;b};\$q1" /etc/vconsole.conf &&
return
+ # If the file exists, try to change the value. The sed command exits
with 1 if no substitution was done.
+ [ -e /etc/vconsole.conf ] && sed -i"" -E
"/^$1=.*\$/,\${s//$1=$2/;b};\$q1" /etc/vconsole.conf && return
+ # Otherwise, add a new assignment.
echo "$1=$2" >> /etc/vconsole.conf
}
@@ -65,12 +71,16 @@
}
# Set legacy sysconfig values for backwards-compat
-[ -z "$CONSOLE_FONT" ] || set_sysconfig_option CONSOLE_FONT "$CONSOLE_FONT"
-[ -z "$CONSOLE_SCREENMAP" ] || set_sysconfig_option CONSOLE_SCREENMAP
"$CONSOLE_SCREENMAP"
-[ -z "$CONSOLE_UNICODEMAP" ] || set_sysconfig_option CONSOLE_UNICODEMAP
"$CONSOLE_UNICODEMAP"
+if [ -e /etc/sysconfig/console ]; then
+ [ -z "$CONSOLE_FONT" ] || set_sysconfig_option CONSOLE_FONT
"$CONSOLE_FONT"
+ [ -z "$CONSOLE_SCREENMAP" ] || set_sysconfig_option CONSOLE_SCREENMAP
"$CONSOLE_SCREENMAP"
+ [ -z "$CONSOLE_UNICODEMAP" ] || set_sysconfig_option CONSOLE_UNICODEMAP
"$CONSOLE_UNICODEMAP"
+fi
-[ -z "$KEYTABLE" ] || set_sysconfig_option KEYTABLE "$KEYTABLE"
-[ -z "$COMPOSETABLE" ] || set_sysconfig_option COMPOSETABLE "$COMPOSETABLE"
+if [ -e /etc/sysconfig/keyboard ]; then
+ [ -z "$KEYTABLE" ] || set_sysconfig_option KEYTABLE "$KEYTABLE"
+ [ -z "$COMPOSETABLE" ] || set_sysconfig_option COMPOSETABLE
"$COMPOSETABLE"
+fi
# Try the lang-provided keytable first
[ -z "$KEYTABLE" ] || localectl set-keymap $KEYTABLE
