Hello community,
here is the log from the commit of package yast2-network for openSUSE:Factory checked in at 2013-07-21 12:00:16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-network (Old)
and /work/SRC/openSUSE:Factory/.yast2-network.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-network"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-network/yast2-network.changes 2013-07-01 16:01:37.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-network.new/yast2-network.changes 2013-07-21 12:00:17.000000000 +0200
@@ -1,0 +2,14 @@
+Tue Jul 16 10:32:22 UTC 2013 - mfilka@suse.com
+
+- adopted to new device type detection API provided by yast2
+- minor improvement in Modem module - no country is selected when
+ a custom provider is selected
+- 2.25.6
+
+-------------------------------------------------------------------
+Tue Jul 16 07:59:47 UTC 2013 - lslezak@suse.cz
+
+- move an include statement to the top level (needed for Ruby
+ translation)
+
+-------------------------------------------------------------------
Old:
----
yast2-network-2.25.5.tar.bz2
New:
----
yast2-network-2.25.6.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-network.spec ++++++
--- /var/tmp/diff_new_pack.EvnTp3/_old 2013-07-21 12:00:18.000000000 +0200
+++ /var/tmp/diff_new_pack.EvnTp3/_new 2013-07-21 12:00:18.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-network
-Version: 2.25.5
+Version: 2.25.6
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -35,8 +35,9 @@
# yast2 v2.23.22: NetworkService handles
# systemd link network.service->NetworkManager.service
-BuildRequires: yast2 >= 2.23.22
-Requires: yast2 >= 2.23.22
+# yast2 v2.24.4: changes in API for Device type detection
+BuildRequires: yast2 >= 2.24.4
+Requires: yast2 >= 2.24.4
#netconfig (FaTE #303618)
Requires: sysconfig >= 0.80.0
++++++ yast2-network-2.25.5.tar.bz2 -> yast2-network-2.25.6.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.25.5/Makefile.in new/yast2-network-2.25.6/Makefile.in
--- old/yast2-network-2.25.5/Makefile.in 2013-06-28 17:01:18.000000000 +0200
+++ new/yast2-network-2.25.6/Makefile.in 2013-07-18 15:28:43.000000000 +0200
@@ -65,7 +65,7 @@
$(srcdir)/Makefile.in $(top_srcdir)/configure config.guess \
config.sub install-sh missing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.25.5/VERSION new/yast2-network-2.25.6/VERSION
--- old/yast2-network-2.25.5/VERSION 2013-06-28 15:40:58.000000000 +0200
+++ new/yast2-network-2.25.6/VERSION 2013-07-16 13:30:56.000000000 +0200
@@ -1 +1 @@
-2.25.5
+2.25.6
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.25.5/agents/Makefile.in new/yast2-network-2.25.6/agents/Makefile.in
--- old/yast2-network-2.25.5/agents/Makefile.in 2013-06-28 17:01:18.000000000 +0200
+++ new/yast2-network-2.25.6/agents/Makefile.in 2013-07-18 15:28:43.000000000 +0200
@@ -61,7 +61,7 @@
subdir = agents
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.25.5/autodocs-ycp.ami new/yast2-network-2.25.6/autodocs-ycp.ami
--- old/yast2-network-2.25.5/autodocs-ycp.ami 2013-06-28 17:01:14.000000000 +0200
+++ new/yast2-network-2.25.6/autodocs-ycp.ami 2013-07-18 15:28:39.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' old/yast2-network-2.25.5/configure new/yast2-network-2.25.6/configure
--- old/yast2-network-2.25.5/configure 2013-06-28 17:01:18.000000000 +0200
+++ new/yast2-network-2.25.6/configure 2013-07-18 15:28:42.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-network 2.25.5.
+# Generated by GNU Autoconf 2.69 for yast2-network 2.25.6.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -579,8 +579,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-network'
PACKAGE_TARNAME='yast2-network'
-PACKAGE_VERSION='2.25.5'
-PACKAGE_STRING='yast2-network 2.25.5'
+PACKAGE_VERSION='2.25.6'
+PACKAGE_STRING='yast2-network 2.25.6'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
PACKAGE_URL=''
@@ -1247,7 +1247,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-network 2.25.5 to adapt to many kinds of systems.
+\`configure' configures yast2-network 2.25.6 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1318,7 +1318,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-network 2.25.5:";;
+ short | recursive ) echo "Configuration of yast2-network 2.25.6:";;
esac
cat <<\_ACEOF
@@ -1398,7 +1398,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-network configure 2.25.5
+yast2-network configure 2.25.6
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1415,7 +1415,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-network $as_me 2.25.5, which was
+It was created by yast2-network $as_me 2.25.6, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2354,7 +2354,7 @@
# Define the identity of the package.
PACKAGE='yast2-network'
- VERSION='2.25.5'
+ VERSION='2.25.6'
cat >>confdefs.h <<_ACEOF
@@ -2477,7 +2477,7 @@
-VERSION="2.25.5"
+VERSION="2.25.6"
RPMNAME="yast2-network"
MAINTAINER="Michal Filka "
@@ -3403,7 +3403,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-network $as_me 2.25.5, which was
+This file was extended by yast2-network $as_me 2.25.6, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3456,7 +3456,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-network config.status 2.25.5
+yast2-network config.status 2.25.6
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-network-2.25.5/configure.ac new/yast2-network-2.25.6/configure.ac
--- old/yast2-network-2.25.5/configure.ac 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-network-2.25.6/configure.ac 2013-07-18 15:28:39.000000000 +0200
@@ -0,0 +1,172 @@
+dnl configure.ac for yast2-network
+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-network, 2.25.6, http://bugs.opensuse.org/, yast2-network)
+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.25.6"
+RPMNAME="yast2-network"
+MAINTAINER="Michal Filka "
+
+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)
+
+
+
+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])
+])
+
+
+AC_CONFIG_FILES(Makefile agents/Makefile
+data/Makefile
+doc/autodocs/Makefile
+doc/Makefile
+src/modules/Makefile
+src/clients/Makefile
+src/routines/Makefile
+src/lan/Makefile
+src/services/Makefile
+src/modem/Makefile
+src/isdn/Makefile
+src/dsl/Makefile
+src/config/Makefile
+src/provider/Makefile
+src/installation/Makefile
+src/remote/Makefile
+src/Makefile
+testsuite/Makefile)
+AC_OUTPUT
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.25.5/configure.in new/yast2-network-2.25.6/configure.in
--- old/yast2-network-2.25.5/configure.in 2013-06-28 17:01:14.000000000 +0200
+++ new/yast2-network-2.25.6/configure.in 1970-01-01 01:00:00.000000000 +0100
@@ -1,172 +0,0 @@
-dnl configure.in for yast2-network
-dnl
-dnl -- This file is generated by y2autoconf 2.24.1 - DO NOT EDIT! --
-dnl (edit configure.in.in instead)
-
-AC_INIT(yast2-network, 2.25.5, http://bugs.opensuse.org/, yast2-network)
-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.25.5"
-RPMNAME="yast2-network"
-MAINTAINER="Michal Filka "
-
-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)
-
-
-
-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])
-])
-
-
-AC_CONFIG_FILES(Makefile agents/Makefile
-data/Makefile
-doc/autodocs/Makefile
-doc/Makefile
-src/modules/Makefile
-src/clients/Makefile
-src/routines/Makefile
-src/lan/Makefile
-src/services/Makefile
-src/modem/Makefile
-src/isdn/Makefile
-src/dsl/Makefile
-src/config/Makefile
-src/provider/Makefile
-src/installation/Makefile
-src/remote/Makefile
-src/Makefile
-testsuite/Makefile)
-AC_OUTPUT
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.25.5/data/Makefile.in new/yast2-network-2.25.6/data/Makefile.in
--- old/yast2-network-2.25.5/data/Makefile.in 2013-06-28 17:01:19.000000000 +0200
+++ new/yast2-network-2.25.6/data/Makefile.in 2013-07-18 15:28:43.000000000 +0200
@@ -56,7 +56,7 @@
subdir = data
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.25.5/doc/Makefile.in new/yast2-network-2.25.6/doc/Makefile.in
--- old/yast2-network-2.25.5/doc/Makefile.in 2013-06-28 17:01:19.000000000 +0200
+++ new/yast2-network-2.25.6/doc/Makefile.in 2013-07-18 15:28:43.000000000 +0200
@@ -58,7 +58,7 @@
subdir = doc
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.25.5/doc/autodocs/Makefile.in new/yast2-network-2.25.6/doc/autodocs/Makefile.in
--- old/yast2-network-2.25.5/doc/autodocs/Makefile.in 2013-06-28 17:01:19.000000000 +0200
+++ new/yast2-network-2.25.6/doc/autodocs/Makefile.in 2013-07-18 15:28:43.000000000 +0200
@@ -26,6 +26,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 __
@@ -72,7 +74,7 @@
$(top_srcdir)/autodocs-ycp.ami
subdir = doc/autodocs
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
@@ -113,7 +115,7 @@
$(am__cd) "$$dir" && rm -f $$files; }; \
}
am__installdirs = "$(DESTDIR)$(htmldir)"
-DATA = $(html_DATA)
+DATA = $(nobase_html_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -233,8 +235,10 @@
yncludedir = @yncludedir@
ystartupdir = @ystartupdir@
AUTODOCS_YCP = $(srcdir)/../../src/*/*.ycp
-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
all: all-am
.SUFFIXES:
@@ -269,26 +273,29 @@
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
-install-htmlDATA: $(html_DATA)
+install-nobase_htmlDATA: $(nobase_html_DATA)
@$(NORMAL_INSTALL)
- @list='$(html_DATA)'; test -n "$(htmldir)" || list=; \
+ @list='$(nobase_html_DATA)'; test -n "$(htmldir)" || list=; \
if test -n "$$list"; then \
echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)'"; \
$(MKDIR_P) "$(DESTDIR)$(htmldir)" || exit 1; \
fi; \
- for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- echo "$$d$$p"; \
- done | $(am__base_list) | \
- while read files; do \
- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(htmldir)'"; \
- $(INSTALL_DATA) $$files "$(DESTDIR)$(htmldir)" || exit $$?; \
+ $(am__nobase_list) | while read dir files; do \
+ xfiles=; for file in $$files; do \
+ if test -f "$$file"; then xfiles="$$xfiles $$file"; \
+ else xfiles="$$xfiles $(srcdir)/$$file"; fi; done; \
+ test -z "$$xfiles" || { \
+ test "x$$dir" = x. || { \
+ echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)/$$dir'"; \
+ $(MKDIR_P) "$(DESTDIR)$(htmldir)/$$dir"; }; \
+ echo " $(INSTALL_DATA) $$xfiles '$(DESTDIR)$(htmldir)/$$dir'"; \
+ $(INSTALL_DATA) $$xfiles "$(DESTDIR)$(htmldir)/$$dir" || exit $$?; }; \
done
-uninstall-htmlDATA:
+uninstall-nobase_htmlDATA:
@$(NORMAL_UNINSTALL)
- @list='$(html_DATA)'; test -n "$(htmldir)" || list=; \
- files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ @list='$(nobase_html_DATA)'; test -n "$(htmldir)" || list=; \
+ $(am__nobase_strip_setup); files=`$(am__nobase_strip)`; \
dir='$(DESTDIR)$(htmldir)'; $(am__uninstall_files_from_dir)
tags: TAGS
TAGS:
@@ -369,7 +376,7 @@
@echo "it deletes files that may require special tools to rebuild."
clean: clean-am
-clean-am: clean-generic mostlyclean-am
+clean-am: clean-generic clean-local mostlyclean-am
distclean: distclean-am
-rm -f Makefile
@@ -387,7 +394,7 @@
info-am:
-install-data-am: install-htmlDATA
+install-data-am: install-nobase_htmlDATA
install-dvi: install-dvi-am
@@ -431,34 +438,44 @@
ps-am:
-uninstall-am: uninstall-htmlDATA
+uninstall-am: uninstall-nobase_htmlDATA
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-htmlDATA install-info install-info-am \
- install-man install-pdf install-pdf-am install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
- uninstall-am uninstall-htmlDATA
+.PHONY: all all-am check check-am clean clean-generic clean-local \
+ distclean distclean-generic distdir dvi dvi-am html html-am \
+ info info-am install install-am install-data install-data-am \
+ install-dvi install-dvi-am install-exec install-exec-am \
+ install-html install-html-am install-info install-info-am \
+ install-man install-nobase_htmlDATA install-pdf install-pdf-am \
+ install-ps install-ps-am install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am uninstall uninstall-am \
+ uninstall-nobase_htmlDATA
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
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.25.5/src/Makefile.in new/yast2-network-2.25.6/src/Makefile.in
--- old/yast2-network-2.25.5/src/Makefile.in 2013-06-28 17:01:19.000000000 +0200
+++ new/yast2-network-2.25.6/src/Makefile.in 2013-07-18 15:28:43.000000000 +0200
@@ -57,7 +57,7 @@
subdir = src
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.25.5/src/clients/Makefile.in new/yast2-network-2.25.6/src/clients/Makefile.in
--- old/yast2-network-2.25.5/src/clients/Makefile.in 2013-06-28 17:01:19.000000000 +0200
+++ new/yast2-network-2.25.6/src/clients/Makefile.in 2013-07-18 15:28:43.000000000 +0200
@@ -61,7 +61,7 @@
$(top_srcdir)/Makefile.am.common
subdir = src/clients
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.25.5/src/clients/lan_proposal.ycp new/yast2-network-2.25.6/src/clients/lan_proposal.ycp
--- old/yast2-network-2.25.5/src/clients/lan_proposal.ycp 2013-05-16 14:01:47.000000000 +0200
+++ new/yast2-network-2.25.6/src/clients/lan_proposal.ycp 2013-07-16 13:30:56.000000000 +0200
@@ -144,7 +144,7 @@
dev = mergestring (splitstring (dev, "/"), ":");
// Lan::Edit (dev);
- if (hasAnyValue(dev)){
+ if (IsNotEmpty(dev)){
foreach(integer row, any value, LanItems::Items,{
LanItems::current = row;
if (LanItems::IsCurrentConfigured()){
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.25.5/src/config/Makefile.in new/yast2-network-2.25.6/src/config/Makefile.in
--- old/yast2-network-2.25.5/src/config/Makefile.in 2013-06-28 17:01:19.000000000 +0200
+++ new/yast2-network-2.25.6/src/config/Makefile.in 2013-07-18 15:28:43.000000000 +0200
@@ -56,7 +56,7 @@
subdir = src/config
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.25.5/src/dsl/Makefile.in new/yast2-network-2.25.6/src/dsl/Makefile.in
--- old/yast2-network-2.25.5/src/dsl/Makefile.in 2013-06-28 17:01:19.000000000 +0200
+++ new/yast2-network-2.25.6/src/dsl/Makefile.in 2013-07-18 15:28:43.000000000 +0200
@@ -60,7 +60,7 @@
subdir = src/dsl
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.25.5/src/installation/Makefile.in new/yast2-network-2.25.6/src/installation/Makefile.in
--- old/yast2-network-2.25.5/src/installation/Makefile.in 2013-06-28 17:01:19.000000000 +0200
+++ new/yast2-network-2.25.6/src/installation/Makefile.in 2013-07-18 15:28:43.000000000 +0200
@@ -62,7 +62,7 @@
$(top_srcdir)/Makefile.am.common
subdir = src/installation
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.25.5/src/isdn/Makefile.in new/yast2-network-2.25.6/src/isdn/Makefile.in
--- old/yast2-network-2.25.5/src/isdn/Makefile.in 2013-06-28 17:01:19.000000000 +0200
+++ new/yast2-network-2.25.6/src/isdn/Makefile.in 2013-07-18 15:28:43.000000000 +0200
@@ -60,7 +60,7 @@
subdir = src/isdn
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.25.5/src/lan/Makefile.in new/yast2-network-2.25.6/src/lan/Makefile.in
--- old/yast2-network-2.25.5/src/lan/Makefile.in 2013-06-28 17:01:19.000000000 +0200
+++ new/yast2-network-2.25.6/src/lan/Makefile.in 2013-07-18 15:28:43.000000000 +0200
@@ -60,7 +60,7 @@
subdir = src/lan
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.25.5/src/lan/bridge.ycp new/yast2-network-2.25.6/src/lan/bridge.ycp
--- old/yast2-network-2.25.5/src/lan/bridge.ycp 2013-04-17 13:23:13.000000000 +0200
+++ new/yast2-network-2.25.6/src/lan/bridge.ycp 2013-07-16 13:30:56.000000000 +0200
@@ -58,7 +58,7 @@
});
foreach(term t, items, {
string device = t[0, 0]:"";
- if (contains(sel, device) && hasAnyValue(device)) {
+ if (contains(sel, device) && IsNotEmpty(device)) {
if (contains(confs, device)){
// allow to add bonding device into bridge and also device with mask /32(bnc#405343)
if (contains(["tun", "tap"], NetworkInterfaces::GetType(device))) continue;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.25.5/src/lan/hardware.ycp new/yast2-network-2.25.6/src/lan/hardware.ycp
--- old/yast2-network-2.25.5/src/lan/hardware.ycp 2013-04-17 13:23:13.000000000 +0200
+++ new/yast2-network-2.25.6/src/lan/hardware.ycp 2013-07-16 13:30:56.000000000 +0200
@@ -41,6 +41,8 @@
import "LanItems";
include "network/summary.ycp";
include "network/routines.ycp";
+/* map NetworkCards */
+include "network/lan/cards.ycp";
/**
* Determines if the dialog is used for adding new device or for editing existing one.
@@ -142,10 +144,6 @@
hardware["type"] = "eth";
}
hardware["realtype"] = NetworkInterfaces::RealType(hardware["type"]:"", hardware["hotplug"]:"");
- /*if (hasAnyValue(NetworkInterfaces::Name))
- {
- hardware["device"] = NetworkInterfaces::device_num(NetworkInterfaces::Name);
- }*/
//Use rather LanItems::device, so that device number is initialized correctly at all times (#308763)
hardware["device"] = LanItems::device;
@@ -153,16 +151,13 @@
string driver = LanItems::getCurrentItem()["udev", "driver"]:"";
- hardware["default_device"] = hasAnyValue(driver) ? driver : LanItems::getCurrentItem()["hwinfo", "module"]:"" ;
+ hardware["default_device"] = IsNotEmpty(driver) ? driver : LanItems::getCurrentItem()["hwinfo", "module"]:"" ;
hardware["options"] = LanItems::driver_options[hardware["default_device"]:""]:"";
// #38213, remember device id when we switch back from pcmcia/usb
hardware["non_hotplug_device_id"] = hardware["device"]:"";
-/*
- hardware["hwcfg"] = LanItems::nm_name;
- if (!hasAnyValue(LanItems::nm_name) && hasAnyValue(LanItems::nm_name_old)) hardware["hwcfg"]=LanItems::nm_name_old;
-*/
+
// FIXME duplicated in address.ycp
hardware["device_types"] = NetworkInterfaces::GetDeviceTypes();
@@ -309,9 +304,6 @@
string type = LanItems::type;
integer selected = 0;
- /* map NetworkCards */
- include "network/lan/cards.ycp";
-
list<map> hwlist = NetworkCards[type]:[];
list cards = hwlist2items(hwlist, 0);
@@ -619,7 +611,7 @@
string nm = sformat("%1%2", LanItems::type, (string) UI::QueryWidget(`id(`num), `Value));
//Remember current device number (#308763)
// see also bnc#391802
- LanItems::device = hasAnyValue(LanItems::device) ? (string) UI::QueryWidget(`id(`num), `Value) : nm;
+ LanItems::device = IsNotEmpty(LanItems::device) ? (string) UI::QueryWidget(`id(`num), `Value) : nm;
if(contains(NetworkInterfaces::List(""), nm)) {
Popup::Error(sformat(_("Configuration name %1 already exists.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.25.5/src/lan/s390.ycp new/yast2-network-2.25.6/src/lan/s390.ycp
--- old/yast2-network-2.25.5/src/lan/s390.ycp 2013-04-17 13:23:13.000000000 +0200
+++ new/yast2-network-2.25.6/src/lan/s390.ycp 2013-07-16 13:30:56.000000000 +0200
@@ -6,6 +6,7 @@
*
* Functions for accessing and handling s390 specific needs.
*/
+{
import "FileUtils";
@@ -21,7 +22,7 @@
if( !Arch::s390())
return false;
- if( IsEmptyString( devname))
+ if( IsEmpty( devname))
return false;
return FileUtils::IsDirectory( sformat( "%1/%2", sys_dir, devname)) == true;
@@ -89,3 +90,5 @@
return result;
}
+
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.25.5/src/lan/wireless.ycp new/yast2-network-2.25.6/src/lan/wireless.ycp
--- old/yast2-network-2.25.5/src/lan/wireless.ycp 2013-01-22 11:31:22.000000000 +0100
+++ new/yast2-network-2.25.6/src/lan/wireless.ycp 2013-07-01 17:16:34.000000000 +0200
@@ -834,7 +834,7 @@
return ret;
}
-
+
// -------------------- WPA EAP --------------------
/**
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.25.5/src/modem/Makefile.in new/yast2-network-2.25.6/src/modem/Makefile.in
--- old/yast2-network-2.25.5/src/modem/Makefile.in 2013-06-28 17:01:19.000000000 +0200
+++ new/yast2-network-2.25.6/src/modem/Makefile.in 2013-07-18 15:28:43.000000000 +0200
@@ -60,7 +60,7 @@
subdir = src/modem
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.25.5/src/modules/Lan.ycp new/yast2-network-2.25.6/src/modules/Lan.ycp
--- old/yast2-network-2.25.5/src/modules/Lan.ycp 2013-04-19 09:41:35.000000000 +0200
+++ new/yast2-network-2.25.6/src/modules/Lan.ycp 2013-07-16 13:30:56.000000000 +0200
@@ -846,7 +846,7 @@
define void ProposeNMInterfaces () {
y2milestone ("Minimal ifcfgs for NM");
foreach (integer number, any lanitem, LanItems::Items, {
- if (hasAnyValue(((map)lanitem)["hwinfo", "dev_name"]:"")) {
+ if (IsNotEmpty(((map)lanitem)["hwinfo", "dev_name"]:"")) {
LanItems::current = number;
if (!LanItems::IsCurrentConfigured()){
y2milestone("Nothing already configured start proposing %1 (NM)", LanItems::getCurrentItem());
@@ -902,7 +902,7 @@
// first configure all connected unconfigured devices with dhcp (with default parameters)
foreach (integer number, any lanitem, LanItems::Items,
{
- if (hasAnyValue(((map)lanitem)["hwinfo", "dev_name"]:""))
+ if (IsNotEmpty(((map)lanitem)["hwinfo", "dev_name"]:""))
{
LanItems::current = number;
boolean valid = LanItems::getCurrentItem()["hwinfo", "link"]:false == true;
@@ -1028,7 +1028,7 @@
foreach (integer number, any lanitem, LanItems::Items, {
- if (hasAnyValue(((map)lanitem)["hwinfo", "dev_name"]:"")) {
+ if (IsNotEmpty(((map)lanitem)["hwinfo", "dev_name"]:"")) {
LanItems::current = number;
boolean link = LanItems::getCurrentItem()["hwinfo", "link"]:false;
if (LanItems::getCurrentItem()["hwinfo", "type"]:"" == "wlan")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.25.5/src/modules/LanItems.ycp new/yast2-network-2.25.6/src/modules/LanItems.ycp
--- old/yast2-network-2.25.5/src/modules/LanItems.ycp 2013-04-30 14:01:38.000000000 +0200
+++ new/yast2-network-2.25.6/src/modules/LanItems.ycp 2013-07-16 13:30:56.000000000 +0200
@@ -384,7 +384,7 @@
foreach(integer key, (list<integer>)Map::Keys(Items),
{
- if (hasAnyValue(Items[key, "udev", "driver"]:""))
+ if (IsNotEmpty(Items[key, "udev", "driver"]:""))
udev_drivers_rules[Items[key, "udev", "driver"]:""] = [ sformat("ENV{MODALIAS}==\"%1\"", Items[key, "hwinfo", "modalias"]:""), sformat("ENV{MODALIAS}=\"%1\"", Items[key, "udev", "driver"]:"") ];
});
@@ -442,7 +442,7 @@
val[ l[0]:"" ]=l[1]:"";
});
- if (!hasAnyValue(value))
+ if (IsEmpty(value))
val=nil;
SCR::Write(add(.modules.options, key), val);
@@ -487,7 +487,7 @@
global list<string> GetItemModules(string default_module){
list<string> mods = [];
- if (hasAnyValue(default_module)) mods = add(mods, default_module);
+ if (IsNotEmpty(default_module)) mods = add(mods, default_module);
foreach(map row, Items[current, "hwinfo", "drivers"]:[], {
string tmp_mod = row["modules", 0, 0]:"";
if (!contains(mods, tmp_mod)) mods = add(mods, tmp_mod);
@@ -526,7 +526,7 @@
string itemBondMaster = bonded[ devname]:"";
- if( !IsEmptyString( itemBondMaster) && ( bondMaster != itemBondMaster) )
+ if( IsNotEmpty( itemBondMaster) && ( bondMaster != itemBondMaster) )
{
y2debug( "IsBondable: excluding lan item (%1: %2) for %3 - is already bonded", itemId, devname, GetDeviceName( current) );
return false;
@@ -605,7 +605,7 @@
y2error( "GetSlaveCandidates: needs a validator.");
return [];
}
- if( IsEmptyString( master))
+ if( IsEmpty( master))
{
y2error( "GetSlaveCandidates: master device name is required.");
return [];
@@ -770,7 +770,7 @@
global boolean needFirmwareCurrentItem(){
boolean need = false;
- if (hasAnyValue(Items[current, "hwinfo", "driver"]:"")){
+ if (IsNotEmpty(Items[current, "hwinfo", "driver"]:"")){
if(haskey(request_firmware, Items[current, "hwinfo", "driver"]:"")) need = true;
} else{
foreach(map driver, Items[current, "hwinfo", "drivers"]:[], {
@@ -786,7 +786,7 @@
global string GetFirmwareForCurrentItem(){
string kernel_module="";
- if (hasAnyValue(Items[current, "hwinfo", "driver"]:"")){
+ if (IsNotEmpty(Items[current, "hwinfo", "driver"]:"")){
if(haskey(request_firmware, Items[current, "hwinfo", "driver"]:"")) kernel_module=Items[current, "hwinfo", "driver"]:"";
} else{
foreach(map driver, Items[current, "hwinfo", "drivers"]:[], {
@@ -875,9 +875,9 @@
descr = CheckEmptyName (type, descr);
list <string> bullets = [];
- if (hasAnyValue(Items[key, "ifcfg"]:"") ){
+ if (IsNotEmpty(Items[key, "ifcfg"]:"") ){
NetworkInterfaces::Select(Items[key, "ifcfg"]:"");
- if (!hasAnyValue(type)) type = NetworkInterfaces::GetType(Items[key, "ifcfg"]:"");
+ if (IsEmpty(type)) type = NetworkInterfaces::GetType(Items[key, "ifcfg"]:"");
descr = BuildDescription(type, NetworkInterfaces::GetType(Items[key, "ifcfg"]:""), NetworkInterfaces::Current, [Items[key, "hwinfo"]:$[]]);
dev = NetworkInterfaces::Name; //NetworkInterfaces::device_name(type, NetworkInterfaces::Name);
ip = DeviceProtocol(NetworkInterfaces::Current);
@@ -914,7 +914,7 @@
if (type == "wlan" &&
!(NetworkInterfaces::Current["WIRELESS_AUTH_MODE"]:"" != "open") &&
- !hasAnyValue(NetworkInterfaces::Current["WIRELESS_KEY_0"]:"")) {
+ IsEmpty(NetworkInterfaces::Current["WIRELESS_KEY_0"]:"")) {
// avoid colons
dev = mergestring (splitstring (dev, ":"), "/");
string href = "lan--wifi-encryption-" + dev;
@@ -955,16 +955,16 @@
string mac_dev = HTML::Bold ("MAC : ") + Items[key, "hwinfo", "mac"]:"" + "<br>";
string bus_id = HTML::Bold ("BusID : ") + Items[key, "hwinfo", "busid"]:"" + "<br>";
- if (hasAnyValue(Items[key, "hwinfo", "mac"]:"")) {
+ if (IsNotEmpty(Items[key, "hwinfo", "mac"]:"")) {
rich = rich + " " + conn + "<br>";
rich = rich + mac_dev;
}
- if (hasAnyValue(Items[key, "hwinfo", "busid"]:"")) {
+ if (IsNotEmpty(Items[key, "hwinfo", "busid"]:"")) {
rich = rich + bus_id;
}
// display it only if we need it, don't duplicate "dev" above
- if (hasAnyValue(Items[key, "hwinfo", "dev_name"]:"") &&
- ! hasAnyValue(Items[key, "ifcfg"]:"")) {
+ if (IsNotEmpty(Items[key, "hwinfo", "dev_name"]:"") &&
+ IsEmpty(Items[key, "ifcfg"]:"")) {
string dev_name = sformat(_("Device Name: %1"), Items[key, "hwinfo", "dev_name"]:"" );
string dev_name_r = HTML::Bold(dev_name) + "<br>";
rich = rich + dev_name_r;
@@ -972,10 +972,10 @@
rich = HTML::Bold ( descr ) + rich;
- if (!hasAnyValue(Items[key, "hwinfo", "dev_name"]:"") && size(Items[key, "hwinfo"]:$[])>0 && !Arch::s390()) {
+ if (IsEmpty(Items[key, "hwinfo", "dev_name"]:"") && size(Items[key, "hwinfo"]:$[])>0 && !Arch::s390()) {
rich = rich + _("<p>Unable to configure the network card because the kernel device (eth0, wlan0) is not present. This is mostly caused by missing firmware (for wlan devices). See dmesg output for details.</p>");
}
- else if (hasAnyValue(Items[key, "ifcfg"]:"") ) {
+ else if (IsNotEmpty(Items[key, "ifcfg"]:"") ) {
rich = rich + HTML::List (bullets);
}
else {
@@ -1421,7 +1421,7 @@
// defaults for a new device
devmap = $[
// for hotplug devices set STARTMODE=hotplug (#132583)
- "STARTMODE": hasAnyValue(Items[current, "hwinfo", "hotplug"]:"") ? "hotplug" : "auto", // #115448, #156388
+ "STARTMODE": IsNotEmpty(Items[current, "hwinfo", "hotplug"]:"") ? "hotplug" : "auto", // #115448, #156388
"NETMASK": (NetHwDetection::result["NETMASK"]:"255.255.255.0"), // #31369
];
string product_startmode = ProductFeatures::GetStringFeature ("network", "startmode");
@@ -1432,17 +1432,17 @@
{
// #164816
y2milestone ("Not a laptop, will not prefer ifplugd");
- product_startmode = hasAnyValue(Items[current, "hwinfo", "hotplug"]:"") ? "hotplug" : "auto";
+ product_startmode = IsNotEmpty(Items[current, "hwinfo", "hotplug"]:"") ? "hotplug" : "auto";
}
if (product_startmode == "ifplugd" && NetworkService::IsManaged())
{
y2milestone ("For NetworkManager will not prefer ifplugd");
- product_startmode = hasAnyValue(Items[current, "hwinfo", "hotplug"]:"") ? "hotplug" : "auto";
+ product_startmode = IsNotEmpty(Items[current, "hwinfo", "hotplug"]:"") ? "hotplug" : "auto";
}
if (product_startmode == "ifplugd" && contains(["bond", "vlan", "br"], type))
{
y2milestone ("For virtual networktypes (bond, bridge, vlan) will not prefer ifplugd");
- product_startmode = hasAnyValue(Items[current, "hwinfo", "hotplug"]:"") ? "hotplug" : "auto";
+ product_startmode = IsNotEmpty(Items[current, "hwinfo", "hotplug"]:"") ? "hotplug" : "auto";
}
devmap["STARTMODE"] = product_startmode;
}
@@ -1824,7 +1824,7 @@
string ifcfg = Items[current, "ifcfg"]:"";
string hwcfg = Items[current, "hwcfg"]:"";
- if (hasAnyValue(ifcfg)) {
+ if (IsNotEmpty(ifcfg)) {
NetworkInterfaces::Delete(ifcfg);
NetworkInterfaces::Commit();
Items[current, "ifcfg"] = "";
@@ -1852,7 +1852,7 @@
NetworkInterfaces::Edit( device);
type = getCurrentItem()[ "hwinfo", "type"]:"";
- if (!hasAnyValue(type))
+ if (IsEmpty(type))
type = NetworkInterfaces::GetType( device);
alias = NetworkInterfaces::alias_num( device);
@@ -1897,14 +1897,14 @@
global void setDriver(string driver){
y2milestone("driver %1, %2", driver, getCurrentItem()["hwinfo", "module"]:"");
- if (getCurrentItem()["hwinfo", "module"]:""==driver && !hasAnyValue(getCurrentItem()["udev", "driver"]:"")) return;
+ if (getCurrentItem()["hwinfo", "module"]:""==driver && IsEmpty(getCurrentItem()["udev", "driver"]:"")) return;
Items[current, "udev", "driver"] = driver;
}
global boolean enableCurrentEditButton(){
if (needFirmwareCurrentItem()) return true;
if (Arch::s390()) return true;
- if (!hasAnyValue(LanItems::getCurrentItem()["hwinfo", "dev_name"]:"") && size(LanItems::getCurrentItem()["hwinfo"]:$[])>0) return false;
+ if (IsEmpty(LanItems::getCurrentItem()["hwinfo", "dev_name"]:"") && size(LanItems::getCurrentItem()["hwinfo"]:$[])>0) return false;
else return true;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.25.5/src/modules/Makefile.in new/yast2-network-2.25.6/src/modules/Makefile.in
--- old/yast2-network-2.25.5/src/modules/Makefile.in 2013-06-28 17:01:19.000000000 +0200
+++ new/yast2-network-2.25.6/src/modules/Makefile.in 2013-07-18 15:28:43.000000000 +0200
@@ -61,7 +61,7 @@
$(top_srcdir)/Makefile.am.common
subdir = src/modules
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.25.5/src/modules/Remote.ycp new/yast2-network-2.25.6/src/modules/Remote.ycp
--- old/yast2-network-2.25.5/src/modules/Remote.ycp 2013-06-28 15:40:58.000000000 +0200
+++ new/yast2-network-2.25.6/src/modules/Remote.ycp 2013-07-16 13:30:56.000000000 +0200
@@ -148,7 +148,7 @@
*/
string ServerArgsRemoveOpt( string server_args, string option, boolean has_value)
{
- if( IsEmptyString( server_args) || IsEmptyString( option))
+ if( IsEmpty( server_args) || IsEmpty( option))
{
return server_args;
}
@@ -179,7 +179,7 @@
*/
string SetServerArgsOpt( string server_args, string option, string value)
{
- string new_server_args = ServerArgsRemoveOpt( server_args, option, !IsEmptyString( value));
+ string new_server_args = ServerArgsRemoveOpt( server_args, option, IsNotEmpty( value));
new_server_args = sformat( "%1 -%2 %3", new_server_args, option, value);
return String::CutBlanks( new_server_args);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.25.5/src/provider/Makefile.in new/yast2-network-2.25.6/src/provider/Makefile.in
--- old/yast2-network-2.25.5/src/provider/Makefile.in 2013-06-28 17:01:19.000000000 +0200
+++ new/yast2-network-2.25.6/src/provider/Makefile.in 2013-07-18 15:28:43.000000000 +0200
@@ -60,7 +60,7 @@
subdir = src/provider
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.25.5/src/provider/dialogs.ycp new/yast2-network-2.25.6/src/provider/dialogs.ycp
--- old/yast2-network-2.25.5/src/provider/dialogs.ycp 2013-01-22 11:31:22.000000000 +0100
+++ new/yast2-network-2.25.6/src/provider/dialogs.ycp 2013-07-16 13:30:56.000000000 +0200
@@ -132,7 +132,10 @@
/* Update custom and providers tables */
if(re != `providers) {
if((boolean) UI::QueryWidget(`id(`custom), `Value))
+ {
country = "_custom";
+ UI::ChangeWidget( `id( `countries), `CurrentItem, nil);
+ }
else
country = (string) UI::QueryWidget(`id(`countries), `CurrentItem);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.25.5/src/remote/Makefile.in new/yast2-network-2.25.6/src/remote/Makefile.in
--- old/yast2-network-2.25.5/src/remote/Makefile.in 2013-06-28 17:01:19.000000000 +0200
+++ new/yast2-network-2.25.6/src/remote/Makefile.in 2013-07-18 15:28:43.000000000 +0200
@@ -60,7 +60,7 @@
subdir = src/remote
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.25.5/src/routines/Makefile.in new/yast2-network-2.25.6/src/routines/Makefile.in
--- old/yast2-network-2.25.5/src/routines/Makefile.in 2013-06-28 17:01:19.000000000 +0200
+++ new/yast2-network-2.25.6/src/routines/Makefile.in 2013-07-18 15:28:43.000000000 +0200
@@ -60,7 +60,7 @@
subdir = src/routines
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.25.5/src/routines/complex.ycp new/yast2-network-2.25.6/src/routines/complex.ycp
--- old/yast2-network-2.25.5/src/routines/complex.ycp 2013-01-22 11:31:22.000000000 +0100
+++ new/yast2-network-2.25.6/src/routines/complex.ycp 2013-07-16 13:30:56.000000000 +0200
@@ -255,7 +255,7 @@
if(haskey(device_names, devtype)) return device_names[devtype]:"";
else {
string descr = NetworkInterfaces::GetDevTypeDescription(devtype, true);
- if (hasAnyValue(descr)) return descr;
+ if (IsNotEmpty(descr)) return descr;
}
if(haskey(device_names, devtype + "-")) {
@@ -367,7 +367,7 @@
string host = NetHwDetection::ResolveIP (addr);
string remip = devmap["REMOTE_IPADDR"]:"";
if (proto == "none") return _("Configured without address (NONE)");
- else if(!hasAnyValue(addr))
+ else if(IsEmpty(addr))
/* Network card status */
return HTML::Colorize (_("Configured without an address"), "red");
else if(remip == "" || remip == nil)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.25.5/src/routines/routines.ycp new/yast2-network-2.25.6/src/routines/routines.ycp
--- old/yast2-network-2.25.5/src/routines/routines.ycp 2013-04-19 17:16:35.000000000 +0200
+++ new/yast2-network-2.25.6/src/routines/routines.ycp 2013-07-16 13:30:56.000000000 +0200
@@ -45,6 +45,7 @@
import "Mode";
import "IP";
import "Netmask";
+import "TypeRepository";
/**
* Abort function
@@ -205,6 +206,22 @@
UI::CloseDialog();
}
+/*
+ * Checks if given value is emtpy.
+ */
+boolean IsEmpty( any value)
+{
+ return TypeRepository::IsEmpty( value);
+}
+
+/*
+ * Checks if given value is non emtpy.
+ */
+boolean IsNotEmpty( any value)
+{
+ return !IsEmpty( value);
+}
+
/**
* Create a list of items for UI from the given list
* @param l given list for conversion
@@ -341,17 +358,10 @@
return drvtype;
}
-boolean hasAnyValue(string value){
- if (value==nil) return false;
- if (size(value)==0) return false;
- else return true;
-}
-
-
boolean needHwcfg(map hw){
boolean need=true;
// if kernel will autoload module for device
- if (hasAnyValue(hw["modalias"]:"")){
+ if (IsNotEmpty(hw["modalias"]:"")){
if (size(hw["drivers"]:[])>1) y2milestone("there are more modules available for device, hwcfg is needed");
else {
y2milestone("Just one autoloadable module available.No need to write hwcfg");
@@ -359,7 +369,7 @@
}
} else
// not autoload because of built-in driver (compiled in kernel)
- if (!hasAnyValue(hw["driver_module"]:"")) {
+ if (IsEmpty(hw["driver_module"]:"")) {
y2milestone("built-in driver %1", hw["driver"]:"");
need=false;
}
@@ -442,7 +452,7 @@
string vendor = "";
string dev = "";
- if (hasAnyValue(hwdevice["device"]:"")) return hwdevice["device"]:"";
+ if (IsNotEmpty(hwdevice["device"]:"")) return hwdevice["device"]:"";
model = hwdevice["model"]:"";
if(model != "" && model != nil) return model;
@@ -844,11 +854,6 @@
* Following functions should be generalized and ported into yast-yast2
*/
-boolean IsEmptyString( string str)
-{
- return ( str == nil) || isempty( str);
-}
-
/**
* @param Shell command to run
* @return Hash in form $[ "exit": <command-exit-status>, "output": [ <1st line>, <2nd line>, ... ] ]
@@ -865,7 +870,7 @@
ret[ "output"] = splitstring( output, "\n");
ret[ "exit"] = result[ "exit"]:1 == 0;
- if( ( ret[ "exit"]:false == false) || ( IsEmptyString( result[ "stderr"]:"") == false) )
+ if( ( ret[ "exit"]:false == false) || ( IsEmpty( result[ "stderr"]:"") == false) )
{
y2error( "RunAndRead <%1>: Command execution failed.\n%2", command, result[ "stderr"]:"");
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.25.5/src/routines/widgets.ycp new/yast2-network-2.25.6/src/routines/widgets.ycp
--- old/yast2-network-2.25.5/src/routines/widgets.ycp 2013-04-17 13:23:13.000000000 +0200
+++ new/yast2-network-2.25.6/src/routines/widgets.ycp 2013-07-16 13:30:56.000000000 +0200
@@ -229,7 +229,7 @@
ip_addr = _("No IP address assigned");
}
string output = sformat(_("%1 \n%2 - %3"),
- device_name, NetworkInterfaces::GetDeviceType(device_id), ip_addr);
+ device_name, NetworkInterfaces::GetDeviceTypeName(device_id), ip_addr);
return output;
}
@@ -311,7 +311,7 @@
string dev_name = LanItems::GetDeviceName( itemId);
map ifcfg = LanItems::GetDeviceMap( itemId);
- if( IsEmptyString( dev_name))
+ if( IsEmpty( dev_name))
{
continue;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.25.5/src/services/Makefile.in new/yast2-network-2.25.6/src/services/Makefile.in
--- old/yast2-network-2.25.5/src/services/Makefile.in 2013-06-28 17:01:19.000000000 +0200
+++ new/yast2-network-2.25.6/src/services/Makefile.in 2013-07-18 15:28:43.000000000 +0200
@@ -60,7 +60,7 @@
subdir = src/services
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.25.5/testsuite/Makefile.in new/yast2-network-2.25.6/testsuite/Makefile.in
--- old/yast2-network-2.25.5/testsuite/Makefile.in 2013-06-28 17:01:19.000000000 +0200
+++ new/yast2-network-2.25.6/testsuite/Makefile.in 2013-07-18 15:28:43.000000000 +0200
@@ -59,7 +59,7 @@
subdir = testsuite
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
N§²æìržyéZ)z{.±ç(húéì¹»®&Þ¢§²ë¢ž¢¶v+b¢v¥rŠjwlzf¢^ˬyÊ&+~
éi¢§²ë¢ž