Hello community, here is the log from the commit of package lsb-release for openSUSE:Factory checked in at 2015-01-30 23:58:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lsb-release (Old) and /work/SRC/openSUSE:Factory/.lsb-release.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "lsb-release" Changes: -------- --- /work/SRC/openSUSE:Factory/lsb-release/lsb-release.changes 2013-10-17 17:42:05.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.lsb-release.new/lsb-release.changes 2015-01-30 23:58:34.000000000 +0100 @@ -1,0 +2,7 @@ +Fri Jan 30 11:08:40 CET 2015 - kukuk@suse.de + +- Read /etc/lsb-release.d/* even if /etc/lsb-release does not + contain a LSB_VERSION entry +- codename is not the distribution version + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lsb-release.spec ++++++ --- /var/tmp/diff_new_pack.Zzto62/_old 2015-01-30 23:58:35.000000000 +0100 +++ /var/tmp/diff_new_pack.Zzto62/_new 2015-01-30 23:58:35.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package lsb-release # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed ++++++ lsb-release-2.0.dif ++++++ --- /var/tmp/diff_new_pack.Zzto62/_old 2015-01-30 23:58:35.000000000 +0100 +++ /var/tmp/diff_new_pack.Zzto62/_new 2015-01-30 23:58:35.000000000 +0100 @@ -1,10 +1,10 @@ --- lsb_release -+++ lsb_release 2013-10-17 10:48:43.000000000 +0200 ++++ lsb_release 2015/01/30 10:06:09 @@ -4,6 +4,7 @@ # # Copyright (C) 2000, 2002, 2004 Free Standards Group, Inc. # Originally by Dominique MASSONIE <mdomi@users.sourceforge.net> -+# Modified for SuSE Linux products by Thorsten Kukuk ++# Modified for SUSE Linux products by Thorsten Kukuk # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -57,7 +57,7 @@ # This script version -SCRIPTVERSION="2.0" -+SCRIPTVERSION="2.0-SuSE" ++SCRIPTVERSION="2.0-SUSE" # Defines the data files -INFO_ROOT="/etc" # directory of config files @@ -90,20 +90,45 @@ echo "FSG `basename $0` v$SCRIPTVERSION" echo echo "Copyright (C) 2000, 2002, 2004 Free Standards Group, Inc." -@@ -188,10 +154,10 @@ +@@ -188,65 +154,54 @@ # Get/Init LSB infos (maybe Distrib infos too) GetLSBInfo() { - if [ -f "$INFO_ROOT/$INFO_LSB_FILE" ] ++ LSB_VERSION="" + if [ -f "$INFO_LSB_FILE" ] then # should init at least LSB_VERSION - . "$INFO_ROOT/$INFO_LSB_FILE" + . "$INFO_LSB_FILE" ++ fi ++ # Always look in the directories ++ if [ -d "$INFO_ROOT/$INFO_LSB_DIR" ] ++ then ++ for tag in "$INFO_ROOT/$INFO_LSB_DIR/"* ++ do ++ if [ -z "$LSB_VERSION" ] ++ then ++ LSB_VERSION=`basename $tag` ++ else ++ LSB_VERSION=$LSB_VERSION:`basename $tag` ++ fi ++ done fi if [ -z "$LSB_VERSION" ] then -@@ -210,43 +176,27 @@ + LSB_VERSION=$MSG_NA +- else +- # if we found LSB_VERSION, continue to look in directory +- if [ -d "$INFO_ROOT/$INFO_LSB_DIR" ] +- then +- for tag in "$INFO_ROOT/$INFO_LSB_DIR/"* +- do +- LSB_VERSION=$LSB_VERSION:`basename $tag` +- done +- fi + fi + } # Get the whole distrib information string (from ARG $1 file) InitDistribInfo() { @@ -156,7 +181,7 @@ [ -z "$DISTRIB_DESCRIPTION" ] \ && DISTRIB_DESCRIPTION=$TMP_DISTRIB_DESC else -@@ -265,8 +215,13 @@ +@@ -265,8 +220,12 @@ if [ -n "$NO" ] then # does not contain "release" delimiter @@ -168,11 +193,10 @@ + DISTRIB_RELEASE=$VERSION_ID + [ -z "$DISTRIB_RELEASE" ] && DISTRIB_RELEASE=$MSG_NA + fi -+ DISTRIB_CODENAME=$(echo $VERSION | sed 's:.*(\(.*\)):\1:') [ -z "$DISTRIB_CODENAME" ] && DISTRIB_CODENAME=$MSG_NA fi fi -@@ -282,16 +237,7 @@ +@@ -282,16 +241,7 @@ if [ -n "$NO" ] then @@ -190,7 +214,7 @@ fi } -@@ -399,7 +345,7 @@ +@@ -399,7 +349,7 @@ fi fi -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org