Merge 1d6c294 into e70a48a

.gitignore

@@ -1,3 +1,6 @@
+*.pot
+*.log
+*.trs
 Makefile
 /Makefile.am
 Makefile.am.common
@@ -12,14 +15,12 @@ config.*
 configure
 configure.in
 configure.ac
+coverage/
 install-sh
 pluglib-bindings.ami
 */.dep
-library/*/.dep
-library/*/*/.dep
-library/*/*.ybc
-library/*/*/*.ybc
-library/*/*/*/*.ybc
+library/**/.dep
+library/**/*.ybc
 doc/autodocs
 library/*/doc/autodocs
 library/*/testsuite/config/
@@ -31,9 +32,10 @@ library/*/testsuite/*.log
 library/*/testsuite/*.sum
 library/*/testsuite/*.exp
 library/*/testsuite/*.bak
-library/*/test/*.log
-library/*/test/*.trs
+library/*/test/**/*.log
+library/*/test/**/*.trs
 /test-driver
+coverage
 
 doc/yast.8
 
@@ -44,10 +46,12 @@ library/network/src/scrconf/network.scr
 missing
 library/packages/src/packages
 /.yardoc
+/*.pot
+*.log
+*.trs
 
 # Package
 package/yast2-*.tar.bz2
-package/yast2.spec
 
 # other
 home:*:*

.travis.yml

@@ -1,19 +1,14 @@
-language: cpp
-compiler:
-    - gcc
+sudo: required
+language: ruby
+services:
+  - docker
+
 before_install:
-    # disable rvm, use system Ruby
-    - rvm reset
-    - wget https://raw.githubusercontent.com/yast/yast-devtools/master/travis-tools/travis_setup.sh
-    - sh ./travis_setup.sh -p "rake yast2-core yast2-devtools yast2-testsuite yast2-ruby-bindings yast2 yast2-pkg-bindings gettext" -g "rspec:3.3.0 yast-rake gettext coveralls rubocop:0.29.1"
-script:
-    - rake check:pot
-    - rubocop
-    - make -s -f Makefile.cvs
-    - make -s
-    - sudo make -s install
-    # English messages, UTF-8, "C" locale for numeric formatting tests
-    - LC_ALL= LANG=en_US.UTF-8 LC_NUMERIC=C make -s check
-    # English messages, UTF-8, "C" locale for numeric formatting tests, enable test coverage report
-    - LC_ALL= LANG=en_US.UTF-8 LC_NUMERIC=C COVERAGE=1 rake test:unit
+  - docker build -t yast-yast2-image .
+  # list the installed packages (just for easier debugging)
+  - docker run --rm -it yast-yast2-image rpm -qa | sort
 
+script:
+  # the "yast-travis-ruby" script is included in the base yastdevel/ruby image
+  # see https://github.com/yast/docker-yast-ruby/blob/master/yast-travis-ruby
+  - docker run -it -e TRAVIS=1 -e TRAVIS_JOB_ID="$TRAVIS_JOB_ID" yast-yast2-image yast-travis-ruby

Dockerfile

@@ -0,0 +1,5 @@
+FROM yastdevel/ruby:sle12-sp3
+COPY . /usr/src/app
+# English messages, UTF-8, "C" locale for numeric formatting tests
+ENV LC_ALL= LANG=en_US.UTF-8 LC_NUMERIC=C
+

library/network/src/modules/NetworkInterfaces.rb

@@ -765,8 +765,7 @@ def Read
         config = CanonicalizeStartmode(config)
         config = filter_interfacetype(config)
 
-        devtype = GetTypeFromIfcfg(config)
-        devtype = GetType(d) if devtype.nil?
+        devtype = GetTypeFromIfcfgOrName(d, config)
 
         dev = @Devices[devtype] || {}
         dev[d] = config

library/network/testsuite/tests/NetworkInterfaces2.out

@@ -37,6 +37,8 @@ Dir	.network.value."eth0.3": ["BOOTPROTO", "ETHERDEVICE", "STARTMODE"]
 Read	.network.value."eth0.3".BOOTPROTO "dhcp"
 Read	.network.value."eth0.3".ETHERDEVICE "eth0"
 Read	.network.value."eth0.3".STARTMODE "manual"
+Read	.target.stat "/sys/class/net/eth0.3/type" nil
+Read	.target.string "/sys/class/net/eth0.3/type" nil
 Dir	.network.value."eth5": ["BOOTPROTO", "STARTMODE"]
 Read	.network.value."eth5".BOOTPROTO "dhcp"
 Read	.network.value."eth5".STARTMODE "manual"
@@ -112,6 +114,8 @@ Read	.network.value."myvlantoo".BOOTPROTO "dhcp"
 Read	.network.value."myvlantoo".ETHERDEVICE "eth0"
 Read	.network.value."myvlantoo".STARTMODE "manual"
 Read	.network.value."myvlantoo".VLAN_ID "2"
+Read	.target.stat "/sys/class/net/myvlantoo/type" nil
+Read	.target.string "/sys/class/net/myvlantoo/type" nil
 Dir	.network.value."ppp5": ["BOOTPROTO", "STARTMODE"]
 Read	.network.value."ppp5".BOOTPROTO "dhcp"
 Read	.network.value."ppp5".STARTMODE "manual"
@@ -126,10 +130,14 @@ Dir	.network.value."virtlan4": ["BOOTPROTO", "ETHERDEVICE", "STARTMODE"]
 Read	.network.value."virtlan4".BOOTPROTO "dhcp"
 Read	.network.value."virtlan4".ETHERDEVICE "eth0"
 Read	.network.value."virtlan4".STARTMODE "manual"
+Read	.target.stat "/sys/class/net/virtlan4/type" nil
+Read	.target.string "/sys/class/net/virtlan4/type" nil
 Dir	.network.value."vlan3": ["BOOTPROTO", "ETHERDEVICE", "STARTMODE"]
 Read	.network.value."vlan3".BOOTPROTO "dhcp"
 Read	.network.value."vlan3".ETHERDEVICE "eth0"
 Read	.network.value."vlan3".STARTMODE "manual"
+Read	.target.stat "/sys/class/net/vlan3/type" nil
+Read	.target.string "/sys/class/net/vlan3/type" nil
 Return	true
 Dump	all=$["arc":$["arc5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "atm":$["atm5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "ci":$["ci5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "ctc":$["ctc5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "dummy":$["dummy5":$["BOOTPROTO":"static", "IPADDR":"1.2.3.4", "NETMASK":"255.0.0.0", "PREFIXLEN":"8", "STARTMODE":"manual"]], "escon":$["escon5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "eth":$["eth5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"], "eth6":$["BOOTPROTO":"static", "IPADDR":"1.2.3.4", "NETMASK":"255.255.255.255", "PREFIXLEN":"32", "STARTMODE":"manual"], "eth7":$["STARTMODE":"manual"], "eth8":$["IPADDR":"1.2.3.4", "NETMASK":"255.0.0.0", "PREFIXLEN":"8", "STARTMODE":"manual"], "eth9":$["IPADDR":"1.2.3.4", "NETMASK":"255.0.0.0", "PREFIXLEN":"8", "STARTMODE":"manual"]], "fddi":$["fddi5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "hippi":$["hippi5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "hsi":$["hsi5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "ippp":$["ippp5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "iucv":$["iucv5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "lo":$["lo":$["BROADCAST":"127.255.255.255", "IPADDR":"127.0.0.1", "NETMASK":"255.0.0.0", "NETWORK":"127.0.0.0", "PREFIXLEN":"8", "STARTMODE":"auto"]], "mynet":$["mynet0":$["BOOTPROTO":"dhcp", "STARTMODE":"auto"]], "myri":$["myri5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "ppp":$["ppp5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "tr":$["tr5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "vlan":$["eth0.3":$["BOOTPROTO":"dhcp", "ETHERDEVICE":"eth0", "STARTMODE":"manual"], "myvlantoo":$["BOOTPROTO":"dhcp", "ETHERDEVICE":"eth0", "STARTMODE":"manual", "VLAN_ID":"2"], "virtlan4":$["BOOTPROTO":"dhcp", "ETHERDEVICE":"eth0", "STARTMODE":"manual"], "vlan3":$["BOOTPROTO":"dhcp", "ETHERDEVICE":"eth0", "STARTMODE":"manual"]]]
 Dump	NetworkInterfaces::Write

package/yast2.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Feb 16 12:30:38 UTC 2018 - knut.anderssen@suse.com
+
+- Fixed interface type detection when read (bsc#1080805)
+  - This fix is a backport from SP2 (bnc#956755, bnc#1061306)
+- 3.1.155.9
+
 -------------------------------------------------------------------
 Mon May 29 08:19:46 UTC 2017 - gsouza@suse.com
 

package/yast2.spec

@@ -17,7 +17,7 @@
 
 
 Name:           yast2
-Version:        3.1.155.8
+Version:        3.1.155.9
 Release:        0
 Url:            https://github.com/yast/yast-yast2