[yast-commit] [ci_new_pac] JFYI yast2-network -> sle12
Script 'mail_helper' called by ro Hello packager, This is just FYI. Your package was checked in in distribution "sle12" by autobuild-member: ro. Here comes the log... ---------------------------%<------------------------------ Hi, here is the log from ci_new_pac /mounts/work_src_done/SLE12/yast2-network -> sle12 ## BNC# 870406 : "network adapter name in Network Settings not same" (RESOLVED/FIXED) Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2-network/yast2-network.changes 2014-04-15 14:45:47.000000000 +0200 +++ /mounts/work_src_done/SLE12/yast2-network/yast2-network.changes 2014-04-17 11:29:28.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Apr 17 08:18:58 UTC 2014 - mfilka@suse.com + +- bnc#870406 + - fixed assigning device name in ifcfg created during installation +- 3.1.48 + +------------------------------------------------------------------- calling whatdependson for sle12-i586 Packages directly triggered for rebuild: - yast2-network - at least 15 other packages ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/SUSE:SLE-12:GA/yast2-network (Old) and /mounts/work_src_done/SLE12/yast2-network (BS:build ID:36496 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-network", Maintainer is "yast-commit@opensuse.org" Old: ---- yast2-network-3.1.47.tar.bz2 New: ---- yast2-network-3.1.48.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-network.spec ++++++ --- /var/tmp/diff_new_pack.LD1C75/_old 2014-04-17 14:17:30.000000000 +0200 +++ /var/tmp/diff_new_pack.LD1C75/_new 2014-04-17 14:17:30.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-network -Version: 3.1.47 +Version: 3.1.48 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-network-3.1.47.tar.bz2 -> yast2-network-3.1.48.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.47/package/yast2-network.changes new/yast2-network-3.1.48/package/yast2-network.changes --- old/yast2-network-3.1.47/package/yast2-network.changes 2014-04-15 11:28:31.000000000 +0200 +++ new/yast2-network-3.1.48/package/yast2-network.changes 2014-04-17 11:24:37.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Apr 17 08:18:58 UTC 2014 - mfilka@suse.com + +- bnc#870406 + - fixed assigning device name in ifcfg created during installation +- 3.1.48 + +------------------------------------------------------------------- Mon Apr 14 16:46:02 UTC 2014 - mfilka@suse.com - bnc#873149 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.47/package/yast2-network.spec new/yast2-network-3.1.48/package/yast2-network.spec --- old/yast2-network-3.1.47/package/yast2-network.spec 2014-04-15 11:28:31.000000000 +0200 +++ new/yast2-network-3.1.48/package/yast2-network.spec 2014-04-17 11:24:37.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-network -Version: 3.1.47 +Version: 3.1.48 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.47/src/lib/network/install_inf_convertor.rb new/yast2-network-3.1.48/src/lib/network/install_inf_convertor.rb --- old/yast2-network-3.1.47/src/lib/network/install_inf_convertor.rb 2014-04-15 11:28:31.000000000 +0200 +++ new/yast2-network-3.1.48/src/lib/network/install_inf_convertor.rb 2014-04-17 11:24:38.000000000 +0200 @@ -11,6 +11,8 @@ BASH_PATH = Path.new(".target.bash") + # Class for accessing /etc/install.inf. + # See http://en.opensuse.org/SDB:Linuxrc_install.inf class InstallInf INSTALL_INF = Path.new(".etc.install_inf") @@ -364,12 +366,13 @@ def create_device_name_ifcfg(hardware) device_name = dev_name - hw_name = BuildDescription( - NetworkInterfaces.device_type(device_name), - NetworkInterfaces.device_num(device_name), - { "dev_name" => device_name }, - hardware - ) + # authoritative sources of device name are: + # - hwinfo + # - install.inf + # nobody else was able to edit device name so far (so ifcfg["NAME"]) + # is empty + hw_name = HardwareName(hardware, device_name) + hw_name = InstallInf["NetCardName"] || "" if hw_name.empty? return "" if hw_name.empty? diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.47/test/install_inf_convertor_test.rb new/yast2-network-3.1.48/test/install_inf_convertor_test.rb --- old/yast2-network-3.1.47/test/install_inf_convertor_test.rb 2014-04-15 11:28:31.000000000 +0200 +++ new/yast2-network-3.1.48/test/install_inf_convertor_test.rb 2014-04-17 11:24:38.000000000 +0200 @@ -89,6 +89,7 @@ before(:each) do @device = "enp0s3" @netconfig = "dhcp" + @netcardname = "Network card name" @install_inf_convertor = Yast::InstallInfConvertor.instance @@ -100,6 +101,9 @@ Yast::InstallInfConvertor::InstallInf .stub(:[]) .with("NetConfig") { @netconfig } + Yast::InstallInfConvertor::InstallInf + .stub(:[]) + .with("NetCardName") { @netcardname } end describe "#dev_name" do @@ -122,7 +126,7 @@ expect(ifcfg = @install_inf_convertor.send(:create_ifcfg)).not_to be_empty expect(ifcfg).to match /BOOTPROTO='dhcp4'/ expect(ifcfg).to match /STARTMODE='onboot'/ - expect(ifcfg).to match /NAME='.*'/ + expect(ifcfg).to match /NAME='#{@netcardname}'/ end end end continue with "q"... Checked in at Thu Apr 17 14:17:52 CEST 2014 by ro Remember to have fun... -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org
participants (1)
-
ro