Hello community, here is the log from the commit of package yast2 for openSUSE:Factory checked in at 2013-07-21 08:14:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-07-01 16:01:16.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2.new/yast2.changes 2013-07-21 08:14:06.000000000 +0200 @@ -1,0 +2,9 @@ +Fri Jul 12 08:20:12 UTC 2013 - [email protected] + +- fixed device type detection when commiting new device into + NetworkInterfaces' cache. Fixes bnc#809053. +- changes API for device type detection - incompatible to previous + versions +- 2.24.4 + +------------------------------------------------------------------- Old: ---- yast2-2.24.3.tar.bz2 New: ---- yast2-2.24.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.no78K2/_old 2013-07-21 08:14:07.000000000 +0200 +++ /var/tmp/diff_new_pack.no78K2/_new 2013-07-21 08:14:07.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2 -Version: 2.24.3 +Version: 2.24.4 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-2.24.3.tar.bz2 -> yast2-2.24.4.tar.bz2 ++++++ ++++ 4446 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.24.3/VERSION new/yast2-2.24.4/VERSION --- old/yast2-2.24.3/VERSION 2013-06-28 15:55:02.000000000 +0200 +++ new/yast2-2.24.4/VERSION 2013-07-16 13:31:18.000000000 +0200 @@ -1 +1 @@ -2.24.3 +2.24.4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.24.3/autodocs-ycp.ami new/yast2-2.24.4/autodocs-ycp.ami --- old/yast2-2.24.3/autodocs-ycp.ami 2013-06-28 15:55:13.000000000 +0200 +++ new/yast2-2.24.4/autodocs-ycp.ami 2013-07-18 14:45:16.000000000 +0200 @@ -8,6 +8,8 @@ # Optional - the default is $(srcdir)/../../src/*.ycp # AUTODOCS_PM: Files that the perl autodocs is built from # Optional - the default is $(srcdir)/../../src/*.pm +# AUTODOCS_RB: Files that the ruby autodocs is built from (using yard) +# Optional - the default is $(srcdir)/../../src/modules/*.rb) $(srcdir)/../../src/include/*/*.rb # AUTODOCS_SUBDIR: To install the result to $(docdir)/SUBDIR/autodocs # Optional - the default is no subdir, $(docdir)/autodocs # AUTODOCS_STRIP: Strip it from filenames. The remaining / are replaced by __ @@ -15,18 +17,29 @@ htmldir = $(docdir)/$(AUTODOCS_SUBDIR)/autodocs -html_DATA = index.html $(filter-out index.html, $(wildcard *.html)) -CLEANFILES = $(html_DATA) pod2htm*.tmp +# use nobase_ prefix to keep the directory structure +nobase_html_DATA = index.html $(filter-out index.html, $(wildcard *.html)) $(wildcard js/*) $(wildcard css/*) $(wildcard Yast/*) +CLEANFILES = $(nobase_html_DATA) pod2htm*.tmp AUTODOCS_YCP ?= $(wildcard $(srcdir)/../../src/*.ycp) AUTODOCS_PM ?= $(wildcard $(srcdir)/../../src/*.pm) +AUTODOCS_RB ?= $(wildcard $(srcdir)/../../src/modules/*.rb $(srcdir)/../../src/include/*/*.rb) AUTODOCS_STRIP ?= $(srcdir)/../../src -index.html: $(AUTODOCS_YCP) $(AUTODOCS_PM) +# yard specific options +YARD ?= yard + +# yard specific clean +clean-local: + rm -rf js css Yast .yardoc + + +index.html: $(AUTODOCS_YCP) $(AUTODOCS_PM) $(AUTODOCS_RB) #including *.pm, for the index - ${YCPDOC} -d. -s$(AUTODOCS_STRIP) $(AUTODOCS_YCP) + if [ -n "$(AUTODOCS_YCP)" ]; then ${YCPDOC} -d. -s$(AUTODOCS_STRIP) $(AUTODOCS_YCP); fi for i in $(AUTODOCS_PM); do \ b=$${i##$(AUTODOCS_STRIP)}; b=$${b#/}; b=$${b//\//__}; b=$${b%.pm}; \ pod2html --title=$$b --infile=$$i --outfile=$$b.html; \ echo "<a href='$$b.html'>$${b/__/::}</a>" > $$b.mod.html; \ done + if [ -n "$(AUTODOCS_RB)" ]; then $(YARD) doc -o . $(AUTODOCS_RB); fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.24.3/configure.ac new/yast2-2.24.4/configure.ac --- old/yast2-2.24.3/configure.ac 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-2.24.4/configure.ac 2013-07-18 14:45:16.000000000 +0200 @@ -0,0 +1,279 @@ +dnl configure.ac for yast2 +dnl +dnl -- This file is generated by y2autoconf 2.24.3 - DO NOT EDIT! -- +dnl (edit configure.ac.in or configure.in.in instead) + +AC_INIT(yast2, 2.24.4, http://bugs.opensuse.org/, yast2) +dnl Check for presence of file 'RPMNAME' +AC_CONFIG_SRCDIR([RPMNAME]) + +dnl Checking host/target/build systems, for make, install etc. +AC_CANONICAL_TARGET +dnl Perform program name transformation +AC_ARG_PROGRAM + +AC_PREFIX_DEFAULT(/usr) + +dnl long filenames; we use GNU Make extensions and that's ok +AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) + +dnl Important YaST2 variables +VERSION="2.24.4" +RPMNAME="yast2" +MAINTAINER="YaST2 Maintainers <[email protected]>" + +dnl pkgconfig honors lib64 +pkgconfigdir=\${libdir}/pkgconfig +pkgconfigdatadir=\${datadir}/pkgconfig +yast2dir=\${prefix}/share/YaST2 + +ybindir=\${prefix}/lib/YaST2/bin +# FIXME duplicates execcompdir +ystartupdir=\${prefix}/lib/YaST2 +plugindir=\${libdir}/YaST2/plugin +includedir=\${prefix}/include/YaST2 +potdir=\${docdir}/pot + +docdir=\${prefix}/share/doc/packages/$RPMNAME +mandir=\${prefix}/share/man + +execcompdir=\${prefix}/lib/YaST2 +agentdir=${execcompdir}/servers_non_y2 + +ydatadir=${yast2dir}/data +imagedir=${yast2dir}/images +themedir=${yast2dir}/theme +localedir=${yast2dir}/locale +clientdir=${yast2dir}/clients +moduledir=${yast2dir}/modules +yncludedir=${yast2dir}/include +schemadir=${yast2dir}/schema +scrconfdir=${yast2dir}/scrconf +desktopdir=\${prefix}/share/applications/YaST2 + +AC_SUBST(VERSION) +AC_SUBST(RPMNAME) +AC_SUBST(MAINTAINER) + +AC_SUBST(pkgconfigdir) +AC_SUBST(pkgconfigdatadir) + +AC_SUBST(yast2dir) + +AC_SUBST(ybindir) +AC_SUBST(ystartupdir) +AC_SUBST(plugindir) +AC_SUBST(includedir) +AC_SUBST(potdir) +AC_SUBST(execcompdir) + +AC_SUBST(docdir) +AC_SUBST(mandir) + +AC_SUBST(ydatadir) +AC_SUBST(imagedir) +AC_SUBST(themedir) +AC_SUBST(localedir) +AC_SUBST(clientdir) +AC_SUBST(moduledir) +AC_SUBST(yncludedir) +AC_SUBST(schemadir) +AC_SUBST(scrconfdir) +AC_SUBST(agentdir) +AC_SUBST(desktopdir) + +fillupdir_d="/var/adm/fillup-templates" +AC_ARG_WITH(fillupdir, + AS_HELP_STRING([--with-fillupdir=DIR], + [where to place fillup templates (default $fillupdir_d.]), + [ fillupdir="$withval" ], + [ fillupdir="$fillupdir_d" ]) +AC_SUBST(fillupdir) + + + +# The yast2 script goes to /sbin. +# If we change the default here instead of in Makefile.am +# then it can be overriden at configure time +if test "${sbindir}" = '${exec_prefix}/sbin'; then + sbindir=/sbin +fi +if test "${sysconfdir}" = '${prefix}/etc'; then + sysconfdir=/etc +fi + +dnl Checks for programs. +AC_PROG_INSTALL +dnl The YCP interpreter checks whether dependent ybc files are older +dnl so we must preserve their timestamps +INSTALL="${INSTALL} -p" +AC_PROG_LN_S +AC_PROG_MAKE_SET + +dnl pkgconfig +AC_ARG_VAR([PKG_CONFIG_PATH], [where to search for pkg-config files]) +dnl devtools +dnl ... + +dnl no need for AC_ARG_VAR +AC_PATH_PROG(XGETTEXT, xgettext) +if test -z "$XGETTEXT" ; then + AC_MSG_ERROR(xgettext is missing; please install gettext-tools.) +fi + +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +AC_SUBST(Y2DEVTOOLS_PREFIX) +devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` +devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` + +dnl producing pkg-config for others? +AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x) +AM_CONDITIONAL(CREATE_PKGCONFIG_NOARCH, test "x${CREATE_PKGCONFIG}" = xnoarch) + +dbdir=${devtools_yast2dir}/data/docbook +STYLESHEET_HTML=${dbdir}/stylesheets/customize-html.xsl +STYLESHEET_PDF=${dbdir}/stylesheets/customize-fo.xsl +STYLESHEET_CSS=${dbdir}/css/yast2docs.css +STYLESHEET_YDOC=${dbdir}/stylesheets/ydoc.xsl +STYLESHEET_YCPDOC=${dbdir}/stylesheets/ycpdoc.xsl +AC_SUBST(STYLESHEET_HTML) +AC_SUBST(STYLESHEET_PDF) +AC_SUBST(STYLESHEET_CSS) +AC_SUBST(STYLESHEET_YDOC) +AC_SUBST(STYLESHEET_YCPDOC) + + +AC_PATH_PROG(YCPDOC, ycpdoc, false, $PATH:$devtools_ybindir) +if test "$YCPDOC" = "false"; then + AC_MSG_ERROR([ycpdoc is not installed]) +fi +AC_PATH_PROG(YCPMAKEDEP, ycpmakedep, false, $PATH:$devtools_ybindir) +if test "$YCPMAKEDEP" = "false"; then + AC_MSG_ERROR([ycpmakedep is not installed]) +fi +AC_PATH_PROG(YCPC, ycpc, false, $PATH:$bindir) +if test "$YCPC" = "false"; then + AC_MSG_ERROR([ycpc is not installed]) +fi +AC_CHECK_FILE($devtools_yast2dir/data/testsuite/Makefile.testsuite, [], [ + AC_MSG_WARN([yast2-testsuite.rpm is not installed]) +]) + +dnl Check packages expect and dejagnu +AC_PATH_PROG(MYEXPECT, expect, false) +if test "$MYEXPECT" = "false"; then + AC_MSG_ERROR([expect not installed]) +fi +AC_PATH_PROG(MYRUNTEST, runtest, false) +if test "$MYRUNTEST" = "false"; then + AC_MSG_ERROR([dejagnu not installed]) +fi + + +AC_MSG_CHECKING([for ifcfg location]) +# fallback, default on openSUSE +IFCFG_DIR=/etc/sysconfig/network +for TRY in /etc/sysconfig/network-scripts; do + if test -d $TRY; then + IFCFG_DIR=$TRY + break + fi +done +AC_SUBST([IFCFG_DIR]) +AC_MSG_RESULT([$IFCFG_DIR]) + +# also done via makefile +AC_CONFIG_FILES(library/modules/Version.ycp +library/network/agents/network.scr) +AC_CONFIG_FILES(Makefile data/Makefile +doc/autodocs/Makefile +doc/examples/Makefile +doc/screenshots/Makefile +doc/Makefile +library/agents/Makefile +library/types/src/Makefile +library/types/testsuite/Makefile +library/types/doc/autodocs/Makefile +library/types/doc/Makefile +library/types/Makefile +library/modules/testsuite/Makefile +library/modules/Makefile +library/runlevel/doc/autodocs/Makefile +library/runlevel/doc/Makefile +library/runlevel/src/Makefile +library/runlevel/testsuite/Makefile +library/runlevel/Makefile +library/sequencer/doc/autodocs/Makefile +library/sequencer/doc/images/Makefile +library/sequencer/doc/examples/Makefile +library/sequencer/doc/Makefile +library/sequencer/src/Makefile +library/sequencer/testsuite/Makefile +library/sequencer/Makefile +library/xml/doc/autodocs/Makefile +library/xml/doc/Makefile +library/xml/src/Makefile +library/xml/Makefile +library/commandline/agents/Makefile +library/commandline/doc/autodocs/Makefile +library/commandline/doc/Makefile +library/commandline/src/Makefile +library/commandline/testsuite/Makefile +library/commandline/Makefile +library/desktop/doc/autodocs/Makefile +library/desktop/doc/Makefile +library/desktop/groups/Makefile +library/desktop/src/Makefile +library/desktop/Makefile +library/wizard/doc/autodocs/Makefile +library/wizard/doc/examples/Makefile +library/wizard/doc/screenshots/Makefile +library/wizard/doc/Makefile +library/wizard/src/Makefile +library/wizard/testsuite/Makefile +library/wizard/Makefile +library/control/doc/autodocs/Makefile +library/control/doc/Makefile +library/control/src/Makefile +library/control/testsuite/Makefile +library/control/Makefile +library/cwm/doc/autodocs/Makefile +library/cwm/doc/Makefile +library/cwm/src/Makefile +library/cwm/testsuite/Makefile +library/cwm/Makefile +library/log/doc/autodocs/Makefile +library/log/doc/Makefile +library/log/src/Makefile +library/log/Makefile +library/system/agents/Makefile +library/system/doc/autodocs/Makefile +library/system/doc/Makefile +library/system/src/Makefile +library/system/testsuite/Makefile +library/system/Makefile +library/packages/src/Makefile +library/packages/testsuite/Makefile +library/packages/doc/autodocs/Makefile +library/packages/doc/Makefile +library/packages/Makefile +library/cron/src/Makefile +library/cron/doc/autodocs/Makefile +library/cron/doc/Makefile +library/cron/Makefile +library/network/agents/Makefile +library/network/doc/autodocs/Makefile +library/network/doc/Makefile +library/network/src/Makefile +library/network/testsuite/Makefile +library/network/Makefile +library/gpg/doc/autodocs/Makefile +library/gpg/doc/Makefile +library/gpg/src/Makefile +library/gpg/testsuite/Makefile +library/gpg/Makefile +library/Makefile +remote/Makefile +scripts/Makefile) +AC_OUTPUT + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.24.3/configure.in new/yast2-2.24.4/configure.in --- old/yast2-2.24.3/configure.in 2013-06-28 15:55:13.000000000 +0200 +++ new/yast2-2.24.4/configure.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,279 +0,0 @@ -dnl configure.in for yast2 -dnl -dnl -- This file is generated by y2autoconf 2.24.1 - DO NOT EDIT! -- -dnl (edit configure.in.in instead) - -AC_INIT(yast2, 2.24.3, http://bugs.opensuse.org/, yast2) -dnl Check for presence of file 'RPMNAME' -AC_CONFIG_SRCDIR([RPMNAME]) - -dnl Checking host/target/build systems, for make, install etc. -AC_CANONICAL_TARGET -dnl Perform program name transformation -AC_ARG_PROGRAM - -AC_PREFIX_DEFAULT(/usr) - -dnl long filenames; we use GNU Make extensions and that's ok -AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) - -dnl Important YaST2 variables -VERSION="2.24.3" -RPMNAME="yast2" -MAINTAINER="YaST2 Maintainers <[email protected]>" - -dnl pkgconfig honors lib64 -pkgconfigdir=\${libdir}/pkgconfig -pkgconfigdatadir=\${datadir}/pkgconfig -yast2dir=\${prefix}/share/YaST2 - -ybindir=\${prefix}/lib/YaST2/bin -# FIXME duplicates execcompdir -ystartupdir=\${prefix}/lib/YaST2 -plugindir=\${libdir}/YaST2/plugin -includedir=\${prefix}/include/YaST2 -potdir=\${docdir}/pot - -docdir=\${prefix}/share/doc/packages/$RPMNAME -mandir=\${prefix}/share/man - -execcompdir=\${prefix}/lib/YaST2 -agentdir=${execcompdir}/servers_non_y2 - -ydatadir=${yast2dir}/data -imagedir=${yast2dir}/images -themedir=${yast2dir}/theme -localedir=${yast2dir}/locale -clientdir=${yast2dir}/clients -moduledir=${yast2dir}/modules -yncludedir=${yast2dir}/include -schemadir=${yast2dir}/schema -scrconfdir=${yast2dir}/scrconf -desktopdir=\${prefix}/share/applications/YaST2 - -AC_SUBST(VERSION) -AC_SUBST(RPMNAME) -AC_SUBST(MAINTAINER) - -AC_SUBST(pkgconfigdir) -AC_SUBST(pkgconfigdatadir) - -AC_SUBST(yast2dir) - -AC_SUBST(ybindir) -AC_SUBST(ystartupdir) -AC_SUBST(plugindir) -AC_SUBST(includedir) -AC_SUBST(potdir) -AC_SUBST(execcompdir) - -AC_SUBST(docdir) -AC_SUBST(mandir) - -AC_SUBST(ydatadir) -AC_SUBST(imagedir) -AC_SUBST(themedir) -AC_SUBST(localedir) -AC_SUBST(clientdir) -AC_SUBST(moduledir) -AC_SUBST(yncludedir) -AC_SUBST(schemadir) -AC_SUBST(scrconfdir) -AC_SUBST(agentdir) -AC_SUBST(desktopdir) - -fillupdir_d="/var/adm/fillup-templates" -AC_ARG_WITH(fillupdir, - AS_HELP_STRING([--with-fillupdir=DIR], - [where to place fillup templates (default $fillupdir_d.]), - [ fillupdir="$withval" ], - [ fillupdir="$fillupdir_d" ]) -AC_SUBST(fillupdir) - - - -# The yast2 script goes to /sbin. -# If we change the default here instead of in Makefile.am -# then it can be overriden at configure time -if test "${sbindir}" = '${exec_prefix}/sbin'; then - sbindir=/sbin -fi -if test "${sysconfdir}" = '${prefix}/etc'; then - sysconfdir=/etc -fi - -dnl Checks for programs. -AC_PROG_INSTALL -dnl The YCP interpreter checks whether dependent ybc files are older -dnl so we must preserve their timestamps -INSTALL="${INSTALL} -p" -AC_PROG_LN_S -AC_PROG_MAKE_SET - -dnl pkgconfig -AC_ARG_VAR([PKG_CONFIG_PATH], [where to search for pkg-config files]) -dnl devtools -dnl ... - -dnl no need for AC_ARG_VAR -AC_PATH_PROG(XGETTEXT, xgettext) -if test -z "$XGETTEXT" ; then - AC_MSG_ERROR(xgettext is missing; please install gettext-tools.) -fi - -Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` -AC_SUBST(Y2DEVTOOLS_PREFIX) -devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` -devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` - -dnl producing pkg-config for others? -AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x) -AM_CONDITIONAL(CREATE_PKGCONFIG_NOARCH, test "x${CREATE_PKGCONFIG}" = xnoarch) - -dbdir=${devtools_yast2dir}/data/docbook -STYLESHEET_HTML=${dbdir}/stylesheets/customize-html.xsl -STYLESHEET_PDF=${dbdir}/stylesheets/customize-fo.xsl -STYLESHEET_CSS=${dbdir}/css/yast2docs.css -STYLESHEET_YDOC=${dbdir}/stylesheets/ydoc.xsl -STYLESHEET_YCPDOC=${dbdir}/stylesheets/ycpdoc.xsl -AC_SUBST(STYLESHEET_HTML) -AC_SUBST(STYLESHEET_PDF) -AC_SUBST(STYLESHEET_CSS) -AC_SUBST(STYLESHEET_YDOC) -AC_SUBST(STYLESHEET_YCPDOC) - - -AC_PATH_PROG(YCPDOC, ycpdoc, false, $PATH:$devtools_ybindir) -if test "$YCPDOC" = "false"; then - AC_MSG_ERROR([ycpdoc is not installed]) -fi -AC_PATH_PROG(YCPMAKEDEP, ycpmakedep, false, $PATH:$devtools_ybindir) -if test "$YCPMAKEDEP" = "false"; then - AC_MSG_ERROR([ycpmakedep is not installed]) -fi -AC_PATH_PROG(YCPC, ycpc, false, $PATH:$bindir) -if test "$YCPC" = "false"; then - AC_MSG_ERROR([ycpc is not installed]) -fi -AC_CHECK_FILE($devtools_yast2dir/data/testsuite/Makefile.testsuite, [], [ - AC_MSG_WARN([yast2-testsuite.rpm is not installed]) -]) - -dnl Check packages expect and dejagnu -AC_PATH_PROG(MYEXPECT, expect, false) -if test "$MYEXPECT" = "false"; then - AC_MSG_ERROR([expect not installed]) -fi -AC_PATH_PROG(MYRUNTEST, runtest, false) -if test "$MYRUNTEST" = "false"; then - AC_MSG_ERROR([dejagnu not installed]) -fi - - -AC_MSG_CHECKING([for ifcfg location]) -# fallback, default on openSUSE -IFCFG_DIR=/etc/sysconfig/network -for TRY in /etc/sysconfig/network-scripts; do - if test -d $TRY; then - IFCFG_DIR=$TRY - break - fi -done -AC_SUBST([IFCFG_DIR]) -AC_MSG_RESULT([$IFCFG_DIR]) - -# also done via makefile -AC_CONFIG_FILES(library/modules/Version.ycp -library/network/agents/network.scr) -AC_CONFIG_FILES(Makefile data/Makefile -doc/autodocs/Makefile -doc/examples/Makefile -doc/screenshots/Makefile -doc/Makefile -library/agents/Makefile -library/types/src/Makefile -library/types/testsuite/Makefile -library/types/doc/autodocs/Makefile -library/types/doc/Makefile -library/types/Makefile -library/modules/testsuite/Makefile -library/modules/Makefile -library/runlevel/doc/autodocs/Makefile -library/runlevel/doc/Makefile -library/runlevel/src/Makefile -library/runlevel/testsuite/Makefile -library/runlevel/Makefile -library/sequencer/doc/autodocs/Makefile -library/sequencer/doc/images/Makefile -library/sequencer/doc/examples/Makefile -library/sequencer/doc/Makefile -library/sequencer/src/Makefile -library/sequencer/testsuite/Makefile -library/sequencer/Makefile -library/xml/doc/autodocs/Makefile -library/xml/doc/Makefile -library/xml/src/Makefile -library/xml/Makefile -library/commandline/agents/Makefile -library/commandline/doc/autodocs/Makefile -library/commandline/doc/Makefile -library/commandline/src/Makefile -library/commandline/testsuite/Makefile -library/commandline/Makefile -library/desktop/doc/autodocs/Makefile -library/desktop/doc/Makefile -library/desktop/groups/Makefile -library/desktop/src/Makefile -library/desktop/Makefile -library/wizard/doc/autodocs/Makefile -library/wizard/doc/examples/Makefile -library/wizard/doc/screenshots/Makefile -library/wizard/doc/Makefile -library/wizard/src/Makefile -library/wizard/testsuite/Makefile -library/wizard/Makefile -library/control/doc/autodocs/Makefile -library/control/doc/Makefile -library/control/src/Makefile -library/control/testsuite/Makefile -library/control/Makefile -library/cwm/doc/autodocs/Makefile -library/cwm/doc/Makefile -library/cwm/src/Makefile -library/cwm/testsuite/Makefile -library/cwm/Makefile -library/log/doc/autodocs/Makefile -library/log/doc/Makefile -library/log/src/Makefile -library/log/Makefile -library/system/agents/Makefile -library/system/doc/autodocs/Makefile -library/system/doc/Makefile -library/system/src/Makefile -library/system/testsuite/Makefile -library/system/Makefile -library/packages/src/Makefile -library/packages/testsuite/Makefile -library/packages/doc/autodocs/Makefile -library/packages/doc/Makefile -library/packages/Makefile -library/cron/src/Makefile -library/cron/doc/autodocs/Makefile -library/cron/doc/Makefile -library/cron/Makefile -library/network/agents/Makefile -library/network/doc/autodocs/Makefile -library/network/doc/Makefile -library/network/src/Makefile -library/network/testsuite/Makefile -library/network/Makefile -library/gpg/doc/autodocs/Makefile -library/gpg/doc/Makefile -library/gpg/src/Makefile -library/gpg/testsuite/Makefile -library/gpg/Makefile -library/Makefile -remote/Makefile -scripts/Makefile) -AC_OUTPUT - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.24.3/library/modules/Version.ycp new/yast2-2.24.4/library/modules/Version.ycp --- old/yast2-2.24.3/library/modules/Version.ycp 2013-06-28 15:55:23.000000000 +0200 +++ new/yast2-2.24.4/library/modules/Version.ycp 2013-07-18 14:45:27.000000000 +0200 @@ -20,7 +20,7 @@ /** * Version of the yast2 package */ -global string yast2 = "2.24.3"; +global string yast2 = "2.24.4"; /* EOF */ } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.24.3/library/network/src/NetworkInterfaces.ycp new/yast2-2.24.4/library/network/src/NetworkInterfaces.ycp --- old/yast2-2.24.3/library/network/src/NetworkInterfaces.ycp 2013-06-28 15:55:02.000000000 +0200 +++ new/yast2-2.24.4/library/network/src/NetworkInterfaces.ycp 2013-07-16 13:31:18.000000000 +0200 @@ -42,6 +42,7 @@ import "Mode"; import "Netmask"; import "String"; +import "TypeRepository"; /** * False suppresses tones of logs 'NetworkInterfaces.ycp:ABC Check(eth,id-00:aa:bb:cc:dd:ee,)' @@ -227,10 +228,17 @@ ]; /** + * Detects device type according given ifcfg configuration * + * @return device type or nil if type cannot be recognized from ifcfg config */ -global string GetTypeFromIfcfg(ifcfg_t ifcfg) { - string type = nil; // unknown +global string GetTypeFromIfcfg(ifcfg_t ifcfg) +{ + string type = nil; + + if( TypeRepository::IsEmpty( ifcfg) ) + return nil; + foreach(list<string> key_type, TypeByValueMatch, { string rule_key = key_type[0]:""; string rule_value = key_type[1]:""; @@ -239,6 +247,7 @@ type = rule_type; } }); + foreach(list<string> key_type, TypeByKeyExistence, { string rule_key = key_type[0]:""; string rule_type = key_type[1]:""; @@ -246,25 +255,56 @@ type = rule_type; } }); + foreach(string rule_key, TypeByKeyValue, { string rule_type = ifcfg[rule_key]:""; if (rule_type != "") { type = rule_type; } }); -//y2internal("from ifcfg: %1", type); + + return type; +} + +/* + * Detects device type according its name and ifcfg configuration. + * + * @param dev device name + * @param ifcfg device's ifcfg configuration + * @return device type + */ +string GetTypeFromIfcfgOrName( string dev, ifcfg_t ifcfg) +{ + string type = GetTypeFromIfcfg( ifcfg); + + if( type == nil) + type = device_type( dev); + return type; } -global string GetType(string dev) { - string type = device_type (dev); - foreach(string dev_type,map<string, ifcfg_t> confs, Devices, { +/* + * Detects device type according cached data + * + * If cached ifcfg for given device is found it is used as parameter for + * GetTypeFromIfcfgOrName( dev, ifcfg). Otherwise is device handled as unconfigured + * and result is equal to GetTypeFromIfcfgOrName( dev, nil) + * + * @param dev device name + * @return detected device type + */ +global string GetType(string dev) +{ + string type = GetTypeFromIfcfgOrName( dev, nil); + + foreach(string dev_type,map<string, ifcfg_t> confs, Devices, + { ifcfg_t ifcfg = confs[dev]:$[]; - string ifcfg_type = GetTypeFromIfcfg(ifcfg); - if (ifcfg_type != nil) - type = ifcfg_type; - }); -//y2internal("original %1: %2", dev, type); + + if( !TypeRepository::IsEmpty( ifcfg) ) + type = GetTypeFromIfcfgOrName( dev, ifcfg); + }); + return type; } @@ -272,10 +312,10 @@ * Return device type in human readable form :-) * @param dev device * @return device type - * @example GetDeviceType(eth-bus-pci-0000:01:07.0) -> "Network Card" - * @example GetDeviceType(modem0) -> "Modem" + * @example GetDeviceTypeName(eth-bus-pci-0000:01:07.0) -> "Network Card" + * @example GetDeviceTypeName(modem0) -> "Modem" */ -global string GetDeviceType(string dev) { +global string GetDeviceTypeName(string dev) { // pppN must be tried before pN, modem before netcard if (regexpmatch(dev,"^" + DeviceRegex["modem"]:"")) { return(_("Modem")); @@ -1263,10 +1303,14 @@ return false; } - string t = GetType(name); - if (name==Name) { - string int_type = Current["INTERFACETYPE"]:""; - if(size(int_type)>0) t = int_type; + string t = !TypeRepository::IsEmpty( newdev) ? GetTypeFromIfcfgOrName( name, newdev) : GetType(name); + + if (name==Name) + { + string int_type = Current["INTERFACETYPE"]:""; + + if(size(int_type)>0) + t = int_type; } string a = alias_num(name); y2debug("ChangeDevice(%1)", name); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.24.3/library/network/src/NetworkPopup.ycp new/yast2-2.24.4/library/network/src/NetworkPopup.ycp --- old/yast2-2.24.3/library/network/src/NetworkPopup.ycp 2013-01-22 12:22:06.000000000 +0100 +++ new/yast2-2.24.4/library/network/src/NetworkPopup.ycp 2013-07-16 13:31:18.000000000 +0200 @@ -80,7 +80,7 @@ } string conn = _("No"); if (NetworkInterfaces::IsConnected(i)) conn = _("Yes"); - return `item(`id(i), NetworkInterfaces::GetDeviceType(i), device_name, ip_addr, i, conn); + return `item(`id(i), NetworkInterfaces::GetDeviceTypeName(i), device_name, ip_addr, i, conn); } ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.24.3/library/network/testsuite/tests/NetworkInterfaces.ycp new/yast2-2.24.4/library/network/testsuite/tests/NetworkInterfaces.ycp --- old/yast2-2.24.3/library/network/testsuite/tests/NetworkInterfaces.ycp 2013-01-22 12:22:06.000000000 +0100 +++ new/yast2-2.24.4/library/network/testsuite/tests/NetworkInterfaces.ycp 2013-07-16 13:31:18.000000000 +0200 @@ -53,29 +53,13 @@ "ip6tnl0", "ip6tnl31", "mip6mnha3", -/* - // trying - "bogusname", - "bogus#foo#bar", - "42", -*/ ]; foreach (string ifcfg, ifcfgs, { - string t = NetworkInterfaces::GetType(ifcfg); + string t = NetworkInterfaces::device_type(ifcfg); DUMP (sformat ("ifcfg-%1, type: %2", ifcfg, t)); -// string i = NetworkDevices::device_num (ifcfg); -// string ai = NetworkDevices::alias_num (ifcfg); }); -/* -DUMP ("Obsolete:"); -TEST(``(NetworkDevices::device_name("eth-pcmcia-","0")), [], nil); -TEST(``(NetworkDevices::device_name("tr-pcmcia-","1")), [], nil); - -TEST(``(NetworkDevices::alias_name("eth-pcmcia-","0","1")), [], nil); -TEST(``(NetworkDevices::alias_name("tr-pcmcia-","1","1")), [], nil); -*/ DUMP ("CanonicalizeIP:"); list<map<string, any> > addresses = [ // normal cases diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.24.3/library/types/src/TypeRepository.ycp new/yast2-2.24.4/library/types/src/TypeRepository.ycp --- old/yast2-2.24.3/library/types/src/TypeRepository.ycp 2013-01-22 12:22:06.000000000 +0100 +++ new/yast2-2.24.4/library/types/src/TypeRepository.ycp 2013-07-16 13:31:18.000000000 +0200 @@ -91,6 +91,35 @@ ]; } +/* + * Checks if given argument is empty. + * + * For other types than string, list, map returns true when value is nil. + * For list and map checks if value is nil or doesn't contain any item ( [] resp $[] ). + * For string checks if value is nil or equal to string without any chars (""). + */ +global boolean IsEmpty( any value) +{ + if( value == nil) + return true; + + boolean ret = false; + + if( is( value, string)) + ret = isempty( (string) value); + + if( is( value, list)) + ret = isempty( (list) value); + + if( is( value, map)) + ret = isempty( (map) value); + + if( is( value, term) ) + ret = size( (term) value) == 0; + + return ret; +} + /************************* generic validators *******************************/ /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.24.3/library/types/testsuite/tests/isempty.ycp new/yast2-2.24.4/library/types/testsuite/tests/isempty.ycp --- old/yast2-2.24.3/library/types/testsuite/tests/isempty.ycp 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-2.24.4/library/types/testsuite/tests/isempty.ycp 2013-07-16 13:31:18.000000000 +0200 @@ -0,0 +1,19 @@ +{ + import "Assert"; + import "TypeRepository"; + + Assert::Equal( true, TypeRepository::IsEmpty( nil)); + Assert::Equal( true, TypeRepository::IsEmpty( "") ); + Assert::Equal( true, TypeRepository::IsEmpty( []) ); + Assert::Equal( true, TypeRepository::IsEmpty( $[]) ); + Assert::Equal( true, TypeRepository::IsEmpty( `HBox()) ); + + Assert::Equal( false, TypeRepository::IsEmpty( 0) ); + Assert::Equal( false, TypeRepository::IsEmpty( 0.0) ); + Assert::Equal( false, TypeRepository::IsEmpty( "item") ); + Assert::Equal( false, TypeRepository::IsEmpty( [ "item"]) ); + Assert::Equal( false, TypeRepository::IsEmpty( $[ "dummy": "item"]) ); + Assert::Equal( false, TypeRepository::IsEmpty( `HBox( `Label())) ); + Assert::Equal( false, TypeRepository::IsEmpty( false) ); + Assert::Equal( false, TypeRepository::IsEmpty( true) ); +} -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
