Hello community, here is the log from the commit of package yast2 for openSUSE:Factory checked in at 2013-07-01 16:01:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2 (Old) and /work/SRC/openSUSE:Factory/.yast2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2/yast2.changes 2013-06-29 14:57:51.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2.new/yast2.changes 2013-07-01 16:01:16.000000000 +0200 @@ -1,0 +2,8 @@ +Fri Jun 28 12:08:50 UTC 2013 - [email protected] + +- bnc#817797 + - data imported into NetworkInterfaces cannot be overwritten by + subsequent Read anymore +- 2.24.3 + +------------------------------------------------------------------- Old: ---- yast2-2.24.2.tar.bz2 New: ---- yast2-2.24.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.q3x0nP/_old 2013-07-01 16:01:17.000000000 +0200 +++ /var/tmp/diff_new_pack.q3x0nP/_new 2013-07-01 16:01:17.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2 -Version: 2.24.2 +Version: 2.24.3 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-2.24.2.tar.bz2 -> yast2-2.24.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.24.2/VERSION new/yast2-2.24.3/VERSION --- old/yast2-2.24.2/VERSION 2013-06-27 17:03:12.000000000 +0200 +++ new/yast2-2.24.3/VERSION 2013-06-28 15:55:02.000000000 +0200 @@ -1 +1 @@ -2.24.2 +2.24.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.24.2/configure new/yast2-2.24.3/configure --- old/yast2-2.24.2/configure 2013-06-27 17:03:23.000000000 +0200 +++ new/yast2-2.24.3/configure 2013-06-28 15:55:16.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for yast2 2.24.2. +# Generated by GNU Autoconf 2.69 for yast2 2.24.3. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -579,8 +579,8 @@ # Identity of this package. PACKAGE_NAME='yast2' PACKAGE_TARNAME='yast2' -PACKAGE_VERSION='2.24.2' -PACKAGE_STRING='yast2 2.24.2' +PACKAGE_VERSION='2.24.3' +PACKAGE_STRING='yast2 2.24.3' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' PACKAGE_URL='' @@ -1250,7 +1250,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2 2.24.2 to adapt to many kinds of systems. +\`configure' configures yast2 2.24.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1321,7 +1321,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2 2.24.2:";; + short | recursive ) echo "Configuration of yast2 2.24.3:";; esac cat <<\_ACEOF @@ -1401,7 +1401,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2 configure 2.24.2 +yast2 configure 2.24.3 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1418,7 +1418,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2 $as_me 2.24.2, which was +It was created by yast2 $as_me 2.24.3, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2357,7 +2357,7 @@ # Define the identity of the package. PACKAGE='yast2' - VERSION='2.24.2' + VERSION='2.24.3' cat >>confdefs.h <<_ACEOF @@ -2480,7 +2480,7 @@ -VERSION="2.24.2" +VERSION="2.24.3" RPMNAME="yast2" MAINTAINER="YaST2 Maintainers <[email protected]>" @@ -3522,7 +3522,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2 $as_me 2.24.2, which was +This file was extended by yast2 $as_me 2.24.3, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3575,7 +3575,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -yast2 config.status 2.24.2 +yast2 config.status 2.24.3 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.24.2/configure.in new/yast2-2.24.3/configure.in --- old/yast2-2.24.2/configure.in 2013-06-27 17:03:19.000000000 +0200 +++ new/yast2-2.24.3/configure.in 2013-06-28 15:55:13.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.24.1 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2, 2.24.2, http://bugs.opensuse.org/, yast2) +AC_INIT(yast2, 2.24.3, http://bugs.opensuse.org/, yast2) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.24.2" +VERSION="2.24.3" RPMNAME="yast2" MAINTAINER="YaST2 Maintainers <[email protected]>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.24.2/library/modules/Version.ycp new/yast2-2.24.3/library/modules/Version.ycp --- old/yast2-2.24.2/library/modules/Version.ycp 2013-06-27 17:03:30.000000000 +0200 +++ new/yast2-2.24.3/library/modules/Version.ycp 2013-06-28 15:55:23.000000000 +0200 @@ -20,7 +20,7 @@ /** * Version of the yast2 package */ -global string yast2 = "2.24.2"; +global string yast2 = "2.24.3"; /* EOF */ } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.24.2/library/network/src/NetworkInterfaces.ycp new/yast2-2.24.3/library/network/src/NetworkInterfaces.ycp --- old/yast2-2.24.2/library/network/src/NetworkInterfaces.ycp 2013-05-14 13:56:37.000000000 +0200 +++ new/yast2-2.24.3/library/network/src/NetworkInterfaces.ycp 2013-06-28 15:55:02.000000000 +0200 @@ -834,10 +834,15 @@ /** * Import data + * + * All devices which confirms to <devregex> are silently removed from Devices + * and replaced by those supplied by <devices>. + * * @param settings settings to be imported * @return true on success */ -global define boolean Import(string devregex, map<string,map> devices) { +global define boolean Import(string devregex, map<string,map> devices) +{ map Devs = FilterNOT(Devices, devregex); y2debug("Devs=%1", Devs); @@ -850,7 +855,20 @@ }); Devices = (devices_t) union(Devs, devices); - OriginalDevices = nil; + + if( devices == nil || devices == $[]) + { + // devices == $[] is used in lan_auto "Reset" as a way how to + // rollback changes imported from AY + initialized = false; + } + else + { + initialized = true; + } + + y2milestone( "NetworkInterfaces::Import - done, cache content: %1", Devices); + return true; } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
