Hello community, here is the log from the commit of package lsb-release for openSUSE:13.1 checked in at 2013-10-17 14:39:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1/lsb-release (Old) and /work/SRC/openSUSE:13.1/.lsb-release.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lsb-release" Changes: -------- --- /work/SRC/openSUSE:13.1/lsb-release/lsb-release.changes 2013-09-23 10:59:44.000000000 +0200 +++ /work/SRC/openSUSE:13.1/.lsb-release.new/lsb-release.changes 2013-10-19 16:49:37.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Oct 17 07:52:33 UTC 2013 - b...@vdm-design.de + +- Change to use /etc/os-release instead of /etc/SuSE-release [bnc#845262] + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lsb-release-2.0.dif ++++++ --- /var/tmp/diff_new_pack.PmhyYD/_old 2013-10-19 16:49:37.000000000 +0200 +++ /var/tmp/diff_new_pack.PmhyYD/_new 2013-10-19 16:49:37.000000000 +0200 @@ -1,5 +1,5 @@ --- lsb_release -+++ lsb_release 2010/09/20 15:30:29 ++++ lsb_release 2013-10-17 10:48:43.000000000 +0200 @@ -4,6 +4,7 @@ # # Copyright (C) 2000, 2002, 2004 Free Standards Group, Inc. @@ -69,7 +69,7 @@ -CHECKFIRST="/etc/redhat-release" # check it before file search +INFO_LSB_FILE="/etc/lsb-release" # where to get LSB version +INFO_LSB_DIR="/etc/lsb-release.d" # where to get LSB addon modules -+INFO_DISTRIB_FILE="/etc/SuSE-release" # <distrib>-<suffix> ++INFO_DISTRIB_FILE="/etc/os-release" # <distrib>-<suffix> # Defines our exit codes EXIT_STATUS="0" # default = Ok :) @@ -103,7 +103,7 @@ fi if [ -z "$LSB_VERSION" ] then -@@ -210,35 +176,18 @@ +@@ -210,43 +176,27 @@ # Get the whole distrib information string (from ARG $1 file) InitDistribInfo() { @@ -145,8 +145,18 @@ + EXIT_STATUS=$ERROR_NOANSWER fi else ++ source $INFO_DISTRIB_FILE NO="" # is Description string syntax correct ? -@@ -265,8 +214,13 @@ + if [ -z "$DISTRIB_DESCRIPTION" ] \ + || [ -n "$(echo $DISTRIB_DESCRIPTION | \ + sed -e "s/.*$DESCSTR_DELI.*//")" ] + then +- TMP_DISTRIB_DESC=$(head -n 1 $FILENAME 2>/dev/null) ++ TMP_DISTRIB_DESC=$PRETTY_NAME + [ -z "$DISTRIB_DESCRIPTION" ] \ + && DISTRIB_DESCRIPTION=$TMP_DISTRIB_DESC + else +@@ -265,8 +215,13 @@ if [ -n "$NO" ] then # does not contain "release" delimiter @@ -155,14 +165,14 @@ + [ -z "$DISTRIB_ID" ] && DISTRIB_ID=$MSG_DISTRIBUTOR + if [ -z "$DISTRIB_RELEASE" ] + then -+ DISTRIB_RELEASE=$(grep ^VERSION $FILENAME | cut "-d " -f 3) ++ DISTRIB_RELEASE=$VERSION_ID + [ -z "$DISTRIB_RELEASE" ] && DISTRIB_RELEASE=$MSG_NA + fi -+ DISTRIB_CODENAME=$(grep ^CODENAME $FILENAME | cut "-d " -f 3) ++ DISTRIB_CODENAME=$(echo $VERSION | sed 's:.*(\(.*\)):\1:') [ -z "$DISTRIB_CODENAME" ] && DISTRIB_CODENAME=$MSG_NA fi fi -@@ -282,16 +236,7 @@ +@@ -282,16 +237,7 @@ if [ -n "$NO" ] then @@ -180,7 +190,7 @@ fi } -@@ -399,7 +344,7 @@ +@@ -399,7 +345,7 @@ fi fi -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org