Hello community, here is the log from the commit of package yast2 for openSUSE:Factory checked in at 2013-07-29 09:26:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-21 08:14:06.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2.new/yast2.changes 2013-07-29 09:26:22.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Jul 18 11:57:12 UTC 2013 - [email protected] + +- added net device type detection based on sysfs +- fixed type detection workflow +- 2.24.5 + +------------------------------------------------------------------- Old: ---- yast2-2.24.4.tar.bz2 New: ---- yast2-2.24.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.hgzOob/_old 2013-07-29 09:26:23.000000000 +0200 +++ /var/tmp/diff_new_pack.hgzOob/_new 2013-07-29 09:26:23.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2 -Version: 2.24.4 +Version: 2.24.5 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-2.24.4.tar.bz2 -> yast2-2.24.5.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.24.4/VERSION new/yast2-2.24.5/VERSION --- old/yast2-2.24.4/VERSION 2013-07-16 13:31:18.000000000 +0200 +++ new/yast2-2.24.5/VERSION 2013-07-23 10:07:48.000000000 +0200 @@ -1 +1 @@ -2.24.4 +2.24.5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.24.4/autodocs-ycp.ami new/yast2-2.24.5/autodocs-ycp.ami --- old/yast2-2.24.4/autodocs-ycp.ami 2013-07-18 14:45:16.000000000 +0200 +++ new/yast2-2.24.5/autodocs-ycp.ami 2013-07-24 12:00:31.000000000 +0200 @@ -28,6 +28,8 @@ # yard specific options YARD ?= yard +# use markdown format by default +YARD_OPTIONS ?= -o . -m markdown # yard specific clean clean-local: @@ -42,4 +44,4 @@ 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 + if [ -n "$(AUTODOCS_RB)" ]; then $(YARD) doc $(YARD_OPTIONS) $(AUTODOCS_RB); fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.24.4/configure new/yast2-2.24.5/configure --- old/yast2-2.24.4/configure 2013-07-18 14:45:20.000000000 +0200 +++ new/yast2-2.24.5/configure 2013-07-24 12:00:35.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.4. +# Generated by GNU Autoconf 2.69 for yast2 2.24.5. # # 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.4' -PACKAGE_STRING='yast2 2.24.4' +PACKAGE_VERSION='2.24.5' +PACKAGE_STRING='yast2 2.24.5' 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.4 to adapt to many kinds of systems. +\`configure' configures yast2 2.24.5 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.4:";; + short | recursive ) echo "Configuration of yast2 2.24.5:";; 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.4 +yast2 configure 2.24.5 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.4, which was +It was created by yast2 $as_me 2.24.5, 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.4' + VERSION='2.24.5' cat >>confdefs.h <<_ACEOF @@ -2480,7 +2480,7 @@ -VERSION="2.24.4" +VERSION="2.24.5" 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.4, which was +This file was extended by yast2 $as_me 2.24.5, 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.4 +yast2 config.status 2.24.5 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.4/configure.ac new/yast2-2.24.5/configure.ac --- old/yast2-2.24.4/configure.ac 2013-07-18 14:45:16.000000000 +0200 +++ new/yast2-2.24.5/configure.ac 2013-07-24 12:00:31.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.ac for yast2 dnl -dnl -- This file is generated by y2autoconf 2.24.3 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.24.5 - DO NOT EDIT! -- dnl (edit configure.ac.in or configure.in.in instead) -AC_INIT(yast2, 2.24.4, http://bugs.opensuse.org/, yast2) +AC_INIT(yast2, 2.24.5, 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.4" +VERSION="2.24.5" RPMNAME="yast2" MAINTAINER="YaST2 Maintainers <[email protected]>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.24.4/doc/autodocs/Makefile.in new/yast2-2.24.5/doc/autodocs/Makefile.in --- old/yast2-2.24.4/doc/autodocs/Makefile.in 2013-07-18 14:45:21.000000000 +0200 +++ new/yast2-2.24.5/doc/autodocs/Makefile.in 2013-07-24 12:00:36.000000000 +0200 @@ -465,6 +465,8 @@ # yard specific options YARD ?= yard +# use markdown format by default +YARD_OPTIONS ?= -o . -m markdown # yard specific clean clean-local: @@ -478,7 +480,7 @@ 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 + if [ -n "$(AUTODOCS_RB)" ]; then $(YARD) doc $(YARD_OPTIONS) $(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-2.24.4/library/commandline/doc/autodocs/Makefile.in new/yast2-2.24.5/library/commandline/doc/autodocs/Makefile.in --- old/yast2-2.24.4/library/commandline/doc/autodocs/Makefile.in 2013-07-18 14:45:22.000000000 +0200 +++ new/yast2-2.24.5/library/commandline/doc/autodocs/Makefile.in 2013-07-24 12:00:37.000000000 +0200 @@ -465,6 +465,8 @@ # yard specific options YARD ?= yard +# use markdown format by default +YARD_OPTIONS ?= -o . -m markdown # yard specific clean clean-local: @@ -478,7 +480,7 @@ 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 + if [ -n "$(AUTODOCS_RB)" ]; then $(YARD) doc $(YARD_OPTIONS) $(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-2.24.4/library/control/doc/autodocs/Makefile.in new/yast2-2.24.5/library/control/doc/autodocs/Makefile.in --- old/yast2-2.24.4/library/control/doc/autodocs/Makefile.in 2013-07-18 14:45:22.000000000 +0200 +++ new/yast2-2.24.5/library/control/doc/autodocs/Makefile.in 2013-07-24 12:00:37.000000000 +0200 @@ -465,6 +465,8 @@ # yard specific options YARD ?= yard +# use markdown format by default +YARD_OPTIONS ?= -o . -m markdown # yard specific clean clean-local: @@ -478,7 +480,7 @@ 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 + if [ -n "$(AUTODOCS_RB)" ]; then $(YARD) doc $(YARD_OPTIONS) $(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-2.24.4/library/cron/doc/autodocs/Makefile.in new/yast2-2.24.5/library/cron/doc/autodocs/Makefile.in --- old/yast2-2.24.4/library/cron/doc/autodocs/Makefile.in 2013-07-18 14:45:22.000000000 +0200 +++ new/yast2-2.24.5/library/cron/doc/autodocs/Makefile.in 2013-07-24 12:00:37.000000000 +0200 @@ -465,6 +465,8 @@ # yard specific options YARD ?= yard +# use markdown format by default +YARD_OPTIONS ?= -o . -m markdown # yard specific clean clean-local: @@ -478,7 +480,7 @@ 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 + if [ -n "$(AUTODOCS_RB)" ]; then $(YARD) doc $(YARD_OPTIONS) $(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-2.24.4/library/cwm/doc/autodocs/Makefile.in new/yast2-2.24.5/library/cwm/doc/autodocs/Makefile.in --- old/yast2-2.24.4/library/cwm/doc/autodocs/Makefile.in 2013-07-18 14:45:22.000000000 +0200 +++ new/yast2-2.24.5/library/cwm/doc/autodocs/Makefile.in 2013-07-24 12:00:37.000000000 +0200 @@ -465,6 +465,8 @@ # yard specific options YARD ?= yard +# use markdown format by default +YARD_OPTIONS ?= -o . -m markdown # yard specific clean clean-local: @@ -478,7 +480,7 @@ 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 + if [ -n "$(AUTODOCS_RB)" ]; then $(YARD) doc $(YARD_OPTIONS) $(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-2.24.4/library/desktop/doc/autodocs/Makefile.in new/yast2-2.24.5/library/desktop/doc/autodocs/Makefile.in --- old/yast2-2.24.4/library/desktop/doc/autodocs/Makefile.in 2013-07-18 14:45:22.000000000 +0200 +++ new/yast2-2.24.5/library/desktop/doc/autodocs/Makefile.in 2013-07-24 12:00:38.000000000 +0200 @@ -465,6 +465,8 @@ # yard specific options YARD ?= yard +# use markdown format by default +YARD_OPTIONS ?= -o . -m markdown # yard specific clean clean-local: @@ -478,7 +480,7 @@ 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 + if [ -n "$(AUTODOCS_RB)" ]; then $(YARD) doc $(YARD_OPTIONS) $(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-2.24.4/library/gpg/doc/autodocs/Makefile.in new/yast2-2.24.5/library/gpg/doc/autodocs/Makefile.in --- old/yast2-2.24.4/library/gpg/doc/autodocs/Makefile.in 2013-07-18 14:45:23.000000000 +0200 +++ new/yast2-2.24.5/library/gpg/doc/autodocs/Makefile.in 2013-07-24 12:00:38.000000000 +0200 @@ -465,6 +465,8 @@ # yard specific options YARD ?= yard +# use markdown format by default +YARD_OPTIONS ?= -o . -m markdown # yard specific clean clean-local: @@ -478,7 +480,7 @@ 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 + if [ -n "$(AUTODOCS_RB)" ]; then $(YARD) doc $(YARD_OPTIONS) $(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-2.24.4/library/log/doc/autodocs/Makefile.in new/yast2-2.24.5/library/log/doc/autodocs/Makefile.in --- old/yast2-2.24.4/library/log/doc/autodocs/Makefile.in 2013-07-18 14:45:23.000000000 +0200 +++ new/yast2-2.24.5/library/log/doc/autodocs/Makefile.in 2013-07-24 12:00:38.000000000 +0200 @@ -465,6 +465,8 @@ # yard specific options YARD ?= yard +# use markdown format by default +YARD_OPTIONS ?= -o . -m markdown # yard specific clean clean-local: @@ -478,7 +480,7 @@ 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 + if [ -n "$(AUTODOCS_RB)" ]; then $(YARD) doc $(YARD_OPTIONS) $(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-2.24.4/library/modules/Version.ycp new/yast2-2.24.5/library/modules/Version.ycp --- old/yast2-2.24.4/library/modules/Version.ycp 2013-07-18 14:45:27.000000000 +0200 +++ new/yast2-2.24.5/library/modules/Version.ycp 2013-07-24 12:00:42.000000000 +0200 @@ -20,7 +20,7 @@ /** * Version of the yast2 package */ -global string yast2 = "2.24.4"; +global string yast2 = "2.24.5"; /* EOF */ } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.24.4/library/network/doc/autodocs/Makefile.in new/yast2-2.24.5/library/network/doc/autodocs/Makefile.in --- old/yast2-2.24.4/library/network/doc/autodocs/Makefile.in 2013-07-18 14:45:23.000000000 +0200 +++ new/yast2-2.24.5/library/network/doc/autodocs/Makefile.in 2013-07-24 12:00:38.000000000 +0200 @@ -465,6 +465,8 @@ # yard specific options YARD ?= yard +# use markdown format by default +YARD_OPTIONS ?= -o . -m markdown # yard specific clean clean-local: @@ -478,7 +480,7 @@ 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 + if [ -n "$(AUTODOCS_RB)" ]; then $(YARD) doc $(YARD_OPTIONS) $(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-2.24.4/library/network/src/NetworkInterfaces.ycp new/yast2-2.24.5/library/network/src/NetworkInterfaces.ycp --- old/yast2-2.24.4/library/network/src/NetworkInterfaces.ycp 2013-07-16 13:31:18.000000000 +0200 +++ new/yast2-2.24.5/library/network/src/NetworkInterfaces.ycp 2013-07-23 10:07:48.000000000 +0200 @@ -43,6 +43,7 @@ import "Netmask"; import "String"; import "TypeRepository"; +import "FileUtils"; /** * False suppresses tones of logs 'NetworkInterfaces.ycp:ABC Check(eth,id-00:aa:bb:cc:dd:ee,)' @@ -132,6 +133,11 @@ return ret; } +boolean IsEmpty( any value) +{ + return TypeRepository::IsEmpty( value); +} + /** * Predefined network device regular expressions */ @@ -202,6 +208,114 @@ return ifcfg_part (dev, "1"); } +/** + * Translates type code exposed by kernel in sysfs onto internaly used dev types. + */ +const map< string, string> TypeBySysfs = $[ + "1": "eth", + "24": "eth", + "32": "ib", + "512": "ppp", + "768": "ipip", + "769": "ip6tnl", + "772": "lo", + "776": "sit", + "778": "gre", + "783": "irda", + "801": "wlan_aux", + "65534": "tun", +]; + +/** + * Detects a subtype of Ethernet device type according /sys or /proc content + */ +string GetEthTypeFromSysfs( string dev) +{ + const string sys_dir_path = sformat( "/sys/class/net/%1/", dev); + + if( FileUtils::Exists( sys_dir_path + "wireless") ) + return "wlan"; + else if( FileUtils::Exists( sys_dir_path + "phy80211") ) + return "wlan"; + else if( FileUtils::Exists( sys_dir_path + "bridge") ) + return "bridge"; + else if( FileUtils::Exists( sys_dir_path + "bonding") ) + return "bond"; + else if( FileUtils::Exists( sys_dir_path + "tun_flags") ) + return "tap"; + else if( FileUtils::Exists( "/proc/net/vlan/" + dev) ) + return "vlan"; + else if( FileUtils::Exists( "/sys/devices/virtual/net/" + dev) && + regexpmatch( dev, "dummy.*") ) + return "dummy"; + else + return "eth"; +} + +/** + * Detects a subtype of InfiniBand device type according /sys or /proc content + */ +string GetIbTypeFromSysfs( string dev) +{ + const string sys_dir_path = sformat( "/sys/class/net/%1/", dev); + + if( FileUtils::Exists( sys_dir_path + "bonding") ) + return "bond"; + else if( FileUtils::Exists( sys_dir_path + "create_child") ) + return "ib"; + else + return "ibchild"; +} + +/** + * Determines device type according /sys/class/net/<dev>/type value + * + * Firstly, it uses /sys/class/net/<dev>/type for basic decision. Obtained values are translated to + * device type according <kernel src>/include/uapi/linux/if_arp.h. Sometimes it uses some other checks + * to specify a "subtype". E.g. in case of "eth" it checks for presence of "wireless" subdir to + * determine "wlan" device. + * + * @return return device type or nil if nothing known found + */ +string GetTypeFromSysfs( string dev) +{ + const string sys_dir_path = sformat( "/sys/class/net/%1", dev); + string sys_type_path = sformat( "%1/type", sys_dir_path); + + if( IsEmpty( dev) || !FileUtils::Exists( sys_type_path) ) + return nil; + + string sys_type = (string) SCR::Read( .target.string, sys_type_path); + + sys_type = sys_type != nil ? regexpsub( sys_type, "(.*)\n", "\\1") : ""; + sys_type = String::CutBlanks( sys_type); + + string type = nil; + + switch( sys_type) + { + case "1": + type = GetEthTypeFromSysfs( dev); + break; + + case "32": + type = GetIbTypeFromSysfs( dev); + break; + + default: + type = TypeBySysfs[ sys_type]: nil; + } + + y2milestone( "GetTypeFromSysFs: device='%1', sysfs type='%2', type='%3'", dev, sys_type, type); + + if( IsEmpty( type)) + { + return nil; + } + + return type; +} + list<string> TypeByKeyValue = [ "INTERFACETYPE", ]; @@ -236,7 +350,7 @@ { string type = nil; - if( TypeRepository::IsEmpty( ifcfg) ) + if( IsEmpty( ifcfg) ) return nil; foreach(list<string> key_type, TypeByValueMatch, { @@ -275,11 +389,19 @@ */ string GetTypeFromIfcfgOrName( string dev, ifcfg_t ifcfg) { - string type = GetTypeFromIfcfg( ifcfg); + if( IsEmpty( dev) ) + return nil; + + string type = GetTypeFromSysfs( dev); + + if( IsEmpty( type) ) + type = GetTypeFromIfcfg( ifcfg); if( type == nil) type = device_type( dev); + y2milestone( "GetTypeFromIfcfgOrName: device='%1', type='%2'", dev, type); + return type; } @@ -301,7 +423,7 @@ { ifcfg_t ifcfg = confs[dev]:$[]; - if( !TypeRepository::IsEmpty( ifcfg) ) + if( !IsEmpty( ifcfg) ) type = GetTypeFromIfcfgOrName( dev, ifcfg); }); @@ -1303,7 +1425,7 @@ return false; } - string t = !TypeRepository::IsEmpty( newdev) ? GetTypeFromIfcfgOrName( name, newdev) : GetType(name); + string t = !IsEmpty( newdev) ? GetTypeFromIfcfgOrName( name, newdev) : GetType(name); if (name==Name) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.24.4/library/network/testsuite/tests/NetworkInterfaces.out new/yast2-2.24.5/library/network/testsuite/tests/NetworkInterfaces.out --- old/yast2-2.24.4/library/network/testsuite/tests/NetworkInterfaces.out 2013-01-22 12:22:06.000000000 +0100 +++ new/yast2-2.24.5/library/network/testsuite/tests/NetworkInterfaces.out 2013-07-23 10:07:48.000000000 +0200 @@ -1,3 +1,5 @@ +Read .target.tmpdir nil +Log Failed to set temporary directory: nil Dump Combined: Dump ifcfg-eth0, type: eth Dump ifcfg-eth1, type: eth diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.24.4/library/network/testsuite/tests/NetworkInterfaces2.out new/yast2-2.24.5/library/network/testsuite/tests/NetworkInterfaces2.out --- old/yast2-2.24.4/library/network/testsuite/tests/NetworkInterfaces2.out 2013-01-22 12:22:06.000000000 +0100 +++ new/yast2-2.24.5/library/network/testsuite/tests/NetworkInterfaces2.out 2013-07-23 10:07:48.000000000 +0200 @@ -1,25 +1,38 @@ +Read .target.tmpdir "/tmp" Dump NetworkInterfaces::Read Dir .network.section: ["arc5", "atm5", "ci5", "ctc5", "dummy5", "escon5", "eth0.3", "eth5", "eth6", "eth7", "eth8", "eth9", "fddi5", "hippi5", "hsi5", "ippp5", "iucv5", "lo", "mynet0", "myri5", "myvlantoo", "ppp5", "tr5", "tr~", "virtlan4", "vlan3"] Dir .network.value."arc5": ["BOOTPROTO", "STARTMODE"] Read .network.value."arc5".BOOTPROTO "dhcp" Read .network.value."arc5".STARTMODE "manual" +Read .target.stat "/sys/class/net/arc5/type" nil +Read .target.string "/sys/class/net/arc5/type" nil Dir .network.value."atm5": ["BOOTPROTO", "STARTMODE"] Read .network.value."atm5".BOOTPROTO "dhcp" Read .network.value."atm5".STARTMODE "manual" +Read .target.stat "/sys/class/net/atm5/type" nil +Read .target.string "/sys/class/net/atm5/type" nil Dir .network.value."ci5": ["BOOTPROTO", "STARTMODE"] Read .network.value."ci5".BOOTPROTO "dhcp" Read .network.value."ci5".STARTMODE "manual" +Read .target.stat "/sys/class/net/ci5/type" nil +Read .target.string "/sys/class/net/ci5/type" nil Dir .network.value."ctc5": ["BOOTPROTO", "STARTMODE"] Read .network.value."ctc5".BOOTPROTO "dhcp" Read .network.value."ctc5".STARTMODE "manual" +Read .target.stat "/sys/class/net/ctc5/type" nil +Read .target.string "/sys/class/net/ctc5/type" nil Dir .network.value."dummy5": ["BOOTPROTO", "IPADDR", "NETMASK", "STARTMODE"] Read .network.value."dummy5".BOOTPROTO "static" Read .network.value."dummy5".IPADDR "1.2.3.4" Read .network.value."dummy5".NETMASK "255.0.0.0" Read .network.value."dummy5".STARTMODE "manual" +Read .target.stat "/sys/class/net/dummy5/type" nil +Read .target.string "/sys/class/net/dummy5/type" nil Dir .network.value."escon5": ["BOOTPROTO", "STARTMODE"] Read .network.value."escon5".BOOTPROTO "dhcp" Read .network.value."escon5".STARTMODE "manual" +Read .target.stat "/sys/class/net/escon5/type" nil +Read .target.string "/sys/class/net/escon5/type" nil Dir .network.value."eth0.3": ["BOOTPROTO", "ETHERDEVICE", "STARTMODE"] Read .network.value."eth0.3".BOOTPROTO "dhcp" Read .network.value."eth0.3".ETHERDEVICE "eth0" @@ -27,40 +40,62 @@ Dir .network.value."eth5": ["BOOTPROTO", "STARTMODE"] Read .network.value."eth5".BOOTPROTO "dhcp" Read .network.value."eth5".STARTMODE "manual" +Read .target.stat "/sys/class/net/eth5/type" nil +Read .target.string "/sys/class/net/eth5/type" nil Dir .network.value."eth6": ["BOOTPROTO", "IPADDR", "STARTMODE"] Read .network.value."eth6".BOOTPROTO "static" Read .network.value."eth6".IPADDR "1.2.3.4" Read .network.value."eth6".STARTMODE "manual" +Read .target.stat "/sys/class/net/eth6/type" nil +Read .target.string "/sys/class/net/eth6/type" nil Dir .network.value."eth7": ["STARTMODE"] Read .network.value."eth7".STARTMODE "manual" +Read .target.stat "/sys/class/net/eth7/type" nil +Read .target.string "/sys/class/net/eth7/type" nil Dir .network.value."eth8": ["IPADDR", "STARTMODE"] Read .network.value."eth8".IPADDR "1.2.3.4/8" Read .network.value."eth8".STARTMODE "manual" +Read .target.stat "/sys/class/net/eth8/type" nil +Read .target.string "/sys/class/net/eth8/type" nil Dir .network.value."eth9": ["IPADDR", "PREFIXLEN", "STARTMODE"] Read .network.value."eth9".IPADDR "1.2.3.4" Read .network.value."eth9".PREFIXLEN "8" Read .network.value."eth9".STARTMODE "manual" +Read .target.stat "/sys/class/net/eth9/type" nil +Read .target.string "/sys/class/net/eth9/type" nil Dir .network.value."fddi5": ["BOOTPROTO", "STARTMODE"] Read .network.value."fddi5".BOOTPROTO "dhcp" Read .network.value."fddi5".STARTMODE "manual" +Read .target.stat "/sys/class/net/fddi5/type" nil +Read .target.string "/sys/class/net/fddi5/type" nil Dir .network.value."hippi5": ["BOOTPROTO", "STARTMODE"] Read .network.value."hippi5".BOOTPROTO "dhcp" Read .network.value."hippi5".STARTMODE "manual" +Read .target.stat "/sys/class/net/hippi5/type" nil +Read .target.string "/sys/class/net/hippi5/type" nil Dir .network.value."hsi5": ["BOOTPROTO", "STARTMODE"] Read .network.value."hsi5".BOOTPROTO "dhcp" Read .network.value."hsi5".STARTMODE "manual" +Read .target.stat "/sys/class/net/hsi5/type" nil +Read .target.string "/sys/class/net/hsi5/type" nil Dir .network.value."ippp5": ["BOOTPROTO", "STARTMODE"] Read .network.value."ippp5".BOOTPROTO "dhcp" Read .network.value."ippp5".STARTMODE "manual" +Read .target.stat "/sys/class/net/ippp5/type" nil +Read .target.string "/sys/class/net/ippp5/type" nil Dir .network.value."iucv5": ["BOOTPROTO", "STARTMODE"] Read .network.value."iucv5".BOOTPROTO "dhcp" Read .network.value."iucv5".STARTMODE "manual" +Read .target.stat "/sys/class/net/iucv5/type" nil +Read .target.string "/sys/class/net/iucv5/type" nil Dir .network.value."lo": ["BROADCAST", "IPADDR", "NETMASK", "NETWORK", "STARTMODE"] Read .network.value."lo".BROADCAST "127.255.255.255" Read .network.value."lo".IPADDR "127.0.0.1" Read .network.value."lo".NETMASK "255.0.0.0" Read .network.value."lo".NETWORK "127.0.0.0" Read .network.value."lo".STARTMODE "onboot" +Read .target.stat "/sys/class/net/lo/type" nil +Read .target.string "/sys/class/net/lo/type" nil Dir .network.value."mynet0": ["BOOTPROTO", "INTERFACETYPE", "STARTMODE"] Read .network.value."mynet0".BOOTPROTO "dhcp" Read .network.value."mynet0".INTERFACETYPE "eth" @@ -68,6 +103,8 @@ Dir .network.value."myri5": ["BOOTPROTO", "STARTMODE"] Read .network.value."myri5".BOOTPROTO "dhcp" Read .network.value."myri5".STARTMODE "manual" +Read .target.stat "/sys/class/net/myri5/type" nil +Read .target.string "/sys/class/net/myri5/type" nil Dir .network.value."myvlantoo": ["BOOTPROTO", "ETHERDEVICE", "STARTMODE", "VLAN_ID"] Read .network.value."myvlantoo".BOOTPROTO "dhcp" Read .network.value."myvlantoo".ETHERDEVICE "eth0" @@ -76,9 +113,13 @@ Dir .network.value."ppp5": ["BOOTPROTO", "STARTMODE"] Read .network.value."ppp5".BOOTPROTO "dhcp" Read .network.value."ppp5".STARTMODE "manual" +Read .target.stat "/sys/class/net/ppp5/type" nil +Read .target.string "/sys/class/net/ppp5/type" nil Dir .network.value."tr5": ["BOOTPROTO", "STARTMODE"] Read .network.value."tr5".BOOTPROTO "dhcp" Read .network.value."tr5".STARTMODE "manual" +Read .target.stat "/sys/class/net/tr5/type" nil +Read .target.string "/sys/class/net/tr5/type" nil Dir .network.value."virtlan4": ["BOOTPROTO", "ETHERDEVICE", "STARTMODE"] Read .network.value."virtlan4".BOOTPROTO "dhcp" Read .network.value."virtlan4".ETHERDEVICE "eth0" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.24.4/library/network/testsuite/tests/NetworkInterfaces2.ycp new/yast2-2.24.5/library/network/testsuite/tests/NetworkInterfaces2.ycp --- old/yast2-2.24.4/library/network/testsuite/tests/NetworkInterfaces2.ycp 2013-01-22 12:22:06.000000000 +0100 +++ new/yast2-2.24.5/library/network/testsuite/tests/NetworkInterfaces2.ycp 2013-07-23 10:07:48.000000000 +0200 @@ -94,11 +94,21 @@ ], ]; -TESTSUITE_INIT([READ], nil); +map EXEC = $[ + "target" : $[ + "bash_output": $[ + "exit": 0, + "stdout": "", + "stderr":"", + ], + ], +]; + +TESTSUITE_INIT([READ, $[], EXEC], nil); import "NetworkInterfaces"; DUMP("NetworkInterfaces::Read"); -TEST(``(NetworkInterfaces::Read()), [READ], nil); +TEST(``(NetworkInterfaces::Read()), [READ, $[], EXEC], nil); DUMP(sformat("all=%1", NetworkInterfaces::Devices)); NetworkInterfaces::OriginalDevices = nil; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.24.4/library/network/testsuite/tests/NetworkInterfaces3.out new/yast2-2.24.5/library/network/testsuite/tests/NetworkInterfaces3.out --- old/yast2-2.24.4/library/network/testsuite/tests/NetworkInterfaces3.out 2013-01-22 12:22:06.000000000 +0100 +++ new/yast2-2.24.5/library/network/testsuite/tests/NetworkInterfaces3.out 2013-07-23 10:07:48.000000000 +0200 @@ -1,3 +1,5 @@ +Read .target.tmpdir nil +Log Failed to set temporary directory: nil Dump ConcealSecrets1: Return $["WIRELESS_KEY":"CONCEALED", "WIRELESS_KEY_1":"CONCEALED", "WIRELESS_KEY_2":"CONCEALED", "WIRELESS_KEY_3":"CONCEALED", "WIRELESS_KEY_4":"", "WIRELESS_KEY_LENGTH":"128", "WIRELESS_WPA_PASSWORD":"CONCEALED", "WIRELESS_WPA_PSK":"CONCEALED", "_aliases":$["foo":$["WIRELESS_KEY":"not masked, should not be here", "alias":"data"]], "other":"data"] Return nil diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.24.4/library/network/testsuite/tests/NetworkInterfaces4.out new/yast2-2.24.5/library/network/testsuite/tests/NetworkInterfaces4.out --- old/yast2-2.24.4/library/network/testsuite/tests/NetworkInterfaces4.out 2013-01-22 12:22:06.000000000 +0100 +++ new/yast2-2.24.5/library/network/testsuite/tests/NetworkInterfaces4.out 2013-07-23 10:07:48.000000000 +0200 @@ -1,8 +1,11 @@ +Read .target.tmpdir "/tmp" Dump NetworkInterfaces::Read Dir .network.section: ["eth4"] Dir .network.value."eth4": ["BOOTPROTO", "NAME"] Read .network.value."eth4".BOOTPROTO "dhcp" Read .network.value."eth4".NAME "we like 'singles'" +Read .target.stat "/sys/class/net/eth4/type" nil +Read .target.string "/sys/class/net/eth4/type" nil Return true Dump NetworkInterfaces::Write Write .network.value."eth4".BOOTPROTO "dhcp" true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.24.4/library/network/testsuite/tests/NetworkInterfaces4.ycp new/yast2-2.24.5/library/network/testsuite/tests/NetworkInterfaces4.ycp --- old/yast2-2.24.4/library/network/testsuite/tests/NetworkInterfaces4.ycp 2013-01-22 12:22:06.000000000 +0100 +++ new/yast2-2.24.5/library/network/testsuite/tests/NetworkInterfaces4.ycp 2013-07-23 10:07:48.000000000 +0200 @@ -41,11 +41,21 @@ ], ]; -TESTSUITE_INIT([READ], nil); +map EXEC = $[ + "target" : $[ + "bash_output": $[ + "exit": 0, + "stdout": "", + "stderr":"", + ], + ], +]; + +TESTSUITE_INIT([READ, $[], EXEC], nil); import "NetworkInterfaces"; DUMP("NetworkInterfaces::Read"); -TEST(``(NetworkInterfaces::Read()), [READ], nil); +TEST(``(NetworkInterfaces::Read()), [READ, $[], EXEC], nil); NetworkInterfaces::OriginalDevices = nil; DUMP("NetworkInterfaces::Write"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.24.4/library/network/testsuite/tests/NetworkInterfaces5-Type.out new/yast2-2.24.5/library/network/testsuite/tests/NetworkInterfaces5-Type.out --- old/yast2-2.24.4/library/network/testsuite/tests/NetworkInterfaces5-Type.out 2013-01-22 12:22:06.000000000 +0100 +++ new/yast2-2.24.5/library/network/testsuite/tests/NetworkInterfaces5-Type.out 2013-07-23 10:07:48.000000000 +0200 @@ -1,3 +1,5 @@ +Read .target.tmpdir nil +Log Failed to set temporary directory: nil Dump NetworkInterfaces::GetTypeFromIfcfg Return true Return true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.24.4/library/packages/doc/autodocs/Makefile.in new/yast2-2.24.5/library/packages/doc/autodocs/Makefile.in --- old/yast2-2.24.4/library/packages/doc/autodocs/Makefile.in 2013-07-18 14:45:23.000000000 +0200 +++ new/yast2-2.24.5/library/packages/doc/autodocs/Makefile.in 2013-07-24 12:00:39.000000000 +0200 @@ -465,6 +465,8 @@ # yard specific options YARD ?= yard +# use markdown format by default +YARD_OPTIONS ?= -o . -m markdown # yard specific clean clean-local: @@ -478,7 +480,7 @@ 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 + if [ -n "$(AUTODOCS_RB)" ]; then $(YARD) doc $(YARD_OPTIONS) $(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-2.24.4/library/runlevel/doc/autodocs/Makefile.in new/yast2-2.24.5/library/runlevel/doc/autodocs/Makefile.in --- old/yast2-2.24.4/library/runlevel/doc/autodocs/Makefile.in 2013-07-18 14:45:24.000000000 +0200 +++ new/yast2-2.24.5/library/runlevel/doc/autodocs/Makefile.in 2013-07-24 12:00:39.000000000 +0200 @@ -465,6 +465,8 @@ # yard specific options YARD ?= yard +# use markdown format by default +YARD_OPTIONS ?= -o . -m markdown # yard specific clean clean-local: @@ -478,7 +480,7 @@ 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 + if [ -n "$(AUTODOCS_RB)" ]; then $(YARD) doc $(YARD_OPTIONS) $(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-2.24.4/library/sequencer/doc/autodocs/Makefile.in new/yast2-2.24.5/library/sequencer/doc/autodocs/Makefile.in --- old/yast2-2.24.4/library/sequencer/doc/autodocs/Makefile.in 2013-07-18 14:45:24.000000000 +0200 +++ new/yast2-2.24.5/library/sequencer/doc/autodocs/Makefile.in 2013-07-24 12:00:39.000000000 +0200 @@ -465,6 +465,8 @@ # yard specific options YARD ?= yard +# use markdown format by default +YARD_OPTIONS ?= -o . -m markdown # yard specific clean clean-local: @@ -478,7 +480,7 @@ 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 + if [ -n "$(AUTODOCS_RB)" ]; then $(YARD) doc $(YARD_OPTIONS) $(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-2.24.4/library/system/doc/autodocs/Makefile.in new/yast2-2.24.5/library/system/doc/autodocs/Makefile.in --- old/yast2-2.24.4/library/system/doc/autodocs/Makefile.in 2013-07-18 14:45:24.000000000 +0200 +++ new/yast2-2.24.5/library/system/doc/autodocs/Makefile.in 2013-07-24 12:00:39.000000000 +0200 @@ -465,6 +465,8 @@ # yard specific options YARD ?= yard +# use markdown format by default +YARD_OPTIONS ?= -o . -m markdown # yard specific clean clean-local: @@ -478,7 +480,7 @@ 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 + if [ -n "$(AUTODOCS_RB)" ]; then $(YARD) doc $(YARD_OPTIONS) $(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-2.24.4/library/types/doc/autodocs/Makefile.in new/yast2-2.24.5/library/types/doc/autodocs/Makefile.in --- old/yast2-2.24.4/library/types/doc/autodocs/Makefile.in 2013-07-18 14:45:24.000000000 +0200 +++ new/yast2-2.24.5/library/types/doc/autodocs/Makefile.in 2013-07-24 12:00:40.000000000 +0200 @@ -465,6 +465,8 @@ # yard specific options YARD ?= yard +# use markdown format by default +YARD_OPTIONS ?= -o . -m markdown # yard specific clean clean-local: @@ -478,7 +480,7 @@ 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 + if [ -n "$(AUTODOCS_RB)" ]; then $(YARD) doc $(YARD_OPTIONS) $(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-2.24.4/library/wizard/doc/autodocs/Makefile.in new/yast2-2.24.5/library/wizard/doc/autodocs/Makefile.in --- old/yast2-2.24.4/library/wizard/doc/autodocs/Makefile.in 2013-07-18 14:45:25.000000000 +0200 +++ new/yast2-2.24.5/library/wizard/doc/autodocs/Makefile.in 2013-07-24 12:00:40.000000000 +0200 @@ -465,6 +465,8 @@ # yard specific options YARD ?= yard +# use markdown format by default +YARD_OPTIONS ?= -o . -m markdown # yard specific clean clean-local: @@ -478,7 +480,7 @@ 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 + if [ -n "$(AUTODOCS_RB)" ]; then $(YARD) doc $(YARD_OPTIONS) $(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-2.24.4/library/xml/doc/autodocs/Makefile.in new/yast2-2.24.5/library/xml/doc/autodocs/Makefile.in --- old/yast2-2.24.4/library/xml/doc/autodocs/Makefile.in 2013-07-18 14:45:25.000000000 +0200 +++ new/yast2-2.24.5/library/xml/doc/autodocs/Makefile.in 2013-07-24 12:00:40.000000000 +0200 @@ -465,6 +465,8 @@ # yard specific options YARD ?= yard +# use markdown format by default +YARD_OPTIONS ?= -o . -m markdown # yard specific clean clean-local: @@ -478,7 +480,7 @@ 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 + if [ -n "$(AUTODOCS_RB)" ]; then $(YARD) doc $(YARD_OPTIONS) $(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. -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
