Script 'mail_helper' called by kukuk Hello packager, This is just FYI. Your package was checked in in distribution "sle12" by autobuild-member: kukuk. Here comes the log... ---------------------------%<------------------------------ Hi, here is the log from ci_new_pac /mounts/work_src_done/SLE12/yast2-network -> sle12 ## BNC# 880167 : "Unable to change NIC name in YaST (ncurses) - SLES12 Beta 7" (RESOLVED/FIXED) ## BNC# 877690 : "yast:title style issues" (RESOLVED/FIXED) Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2-network/yast2-network.changes 2014-06-11 15:30:10.000000000 +0200 +++ /mounts/work_src_done/SLE12/yast2-network/yast2-network.changes 2014-06-16 15:05:05.000000000 +0200 @@ -1,0 +2,9 @@ +Sat Jun 14 20:20:57 UTC 2014 - mfilka@suse.com + +- bnc#880167 + - fixed internal error when renaming device +- bnc#877690 + - turned more labels into title style. +- 3.1.64 + +------------------------------------------------------------------- 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:39590 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-network", Maintainer is "yast-commit@opensuse.org" Old: ---- yast2-network-3.1.63.tar.bz2 New: ---- yast2-network-3.1.64.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-network.spec ++++++ --- /var/tmp/diff_new_pack.tQRDG2/_old 2014-06-16 15:48:00.000000000 +0200 +++ /var/tmp/diff_new_pack.tQRDG2/_new 2014-06-16 15:48:00.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-network -Version: 3.1.63 +Version: 3.1.64 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-network-3.1.63.tar.bz2 -> yast2-network-3.1.64.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.63/package/yast2-network.changes new/yast2-network-3.1.64/package/yast2-network.changes --- old/yast2-network-3.1.63/package/yast2-network.changes 2014-06-11 14:16:13.000000000 +0200 +++ new/yast2-network-3.1.64/package/yast2-network.changes 2014-06-16 15:01:45.000000000 +0200 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Sat Jun 14 20:20:57 UTC 2014 - mfilka@suse.com + +- bnc#880167 + - fixed internal error when renaming device +- bnc#877690 + - turned more labels into title style. +- 3.1.64 + +------------------------------------------------------------------- Wed Jun 11 10:06:12 UTC 2014 - mfilka@suse.com - bnc#878719 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.63/package/yast2-network.spec new/yast2-network-3.1.64/package/yast2-network.spec --- old/yast2-network-3.1.63/package/yast2-network.spec 2014-06-11 14:16:13.000000000 +0200 +++ new/yast2-network-3.1.64/package/yast2-network.spec 2014-06-16 15:01:45.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-network -Version: 3.1.63 +Version: 3.1.64 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.63/src/include/network/lan/hardware.rb new/yast2-network-3.1.64/src/include/network/lan/hardware.rb --- old/yast2-network-3.1.63/src/include/network/lan/hardware.rb 2014-06-11 14:16:13.000000000 +0200 +++ new/yast2-network-3.1.64/src/include/network/lan/hardware.rb 2014-06-16 15:01:45.000000000 +0200 @@ -46,7 +46,6 @@ Yast.import "LanItems" Yast.include include_target, "network/summary.rb" Yast.include include_target, "network/routines.rb" - # map NetworkCards Yast.include include_target, "network/lan/cards.rb" @hardware = nil @@ -160,7 +159,6 @@ def initHardware @hardware = {} - # hardware["modul"] = NetworkModules::Alias; // FIXME: MOD Lan::Module["module"]:""; Ops.set(@hardware, "hotplug", LanItems.hotplug) Builtins.y2milestone("hotplug=%1", LanItems.hotplug) Ops.set( @@ -272,6 +270,9 @@ initHardware + hotplug_type = @hardware["hotplug"] || "" + hw_type = @hardware["type"] || "" + _CheckBoxes = HBox( HSpacing(1.5), # CheckBox label @@ -279,15 +280,16 @@ Id(:pcmcia), Opt(:notify), _("&PCMCIA"), - Ops.get_string(@hardware, "hotplug", "") == "pcmcia" + hotplug_type == "pcmcia" ), HSpacing(1.5), + # CheckBox label CheckBox( Id(:usb), Opt(:notify), _("&USB"), - Ops.get_string(@hardware, "hotplug", "") == "usb" + hotplug_type == "usb" ), HSpacing(1.5) ) @@ -301,7 +303,7 @@ Id(:pci), Opt(:notify), _("P&CI"), - Ops.get_string(@hardware, "hotplug", "") == "pci" + hotplug_type == "pci" ), HSpacing(1.5) ) @@ -323,14 +325,14 @@ Id(:modul), Opt(:editable), _("&Module Name"), - Ops.get_list(@hardware, "modules_from_hwinfo", []) + @hardware["modules_from_hwinfo"] || [] ), - HSpacing(0.2), + HSpacing(0.5), InputField( Id(:options), Opt(:hstretch), Label.Options, - Ops.get_string(@hardware, "options", "") + @hardware["options"] || "" ) ), VSpacing(0.4), @@ -349,7 +351,7 @@ Id(:num), Opt(:editable, :hstretch), _("&Configuration Name"), - [Ops.get_string(@hardware, "device", "")] + [@hardware["device"] || ""] ) ) @@ -364,8 +366,8 @@ # ComboBox label _("&Device Type"), BuildTypesList( - Ops.get_list(@hardware, "device_types", []), - Ops.get_string(@hardware, "type", "") + @hardware["device_types"] || [], + hw_type ) ), HSpacing(1.5), @@ -377,7 +379,7 @@ _UdevWidget = # TODO: Ud ... Rules Frame( - _("Udev rules"), + _("Udev Rules"), HBox( InputField(Id(:device_name), Opt(:hstretch), _("Device Name"), ""), PushButton(Id(:change_udev), _("Change")) @@ -391,12 +393,12 @@ end _BlinkCard = Frame( - _("Show visible port identification"), + _("Show Visible Port Identification"), HBox( #translators: how many seconds will card be blinking IntField( Id(:blink_time), - Builtins.sformat("%1:", _("Seconds")), + "%s:" % _("Seconds"), 0, 100, 5 @@ -406,13 +408,13 @@ ) _EthtoolWidget = Frame( - _("Ethtool options"), + _("Ethtool Options"), HBox( InputField( Id(:ethtool_opts), Opt(:hstretch), _("Options"), - Ops.get_string(@hardware, "ethtool_options", "") + @hardware["ethtool_options"] || "" ) ) ) @@ -429,53 +431,47 @@ UI.ChangeWidget( :modul, :Value, - Ops.get_string(@hardware, "default_device", "") + @hardware["default_device"] || "" ) UI.ChangeWidget( Id(:modul), :Enabled, - Ops.get_boolean(@hardware, "no_hotplug_dummy", false) + !!@hardware["no_hotplug_dummy"] ) - # UI::ChangeWidget(`id(`options), `Enabled, hardware["no_hotplug_dummy"]:false); ChangeWidgetIfExists( Id(:list), :Enabled, - Ops.get_boolean(@hardware, "no_hotplug_dummy", false) + !!@hardware["no_hotplug_dummy"] ) ChangeWidgetIfExists( Id(:hwcfg), :Enabled, - Ops.get_boolean(@hardware, "no_hotplug", false) + !!@hardware["no_hotplug"] ) ChangeWidgetIfExists( Id(:usb), :Enabled, - (Ops.get_string(@hardware, "hotplug", "") == "usb" || - Ops.get_string(@hardware, "hotplug", "") == "") && - Ops.get_string(@hardware, "type", "") != "dummy" + (hotplug_type == "usb" || hotplug_type == "") && + hw_type != "dummy" ) ChangeWidgetIfExists( Id(:pcmcia), :Enabled, - (Ops.get_string(@hardware, "hotplug", "") == "pcmcia" || - Ops.get_string(@hardware, "hotplug", "") == "") && - Ops.get_string(@hardware, "type", "") != "dummy" + (hotplug_type == "pcmcia" || hotplug_type == "") && + hw_type != "dummy" ) + device_name = LanItems.current_udev_name + ChangeWidgetIfExists(Id(:device_name), :Enabled, false) - ChangeWidgetIfExists( - Id(:device_name), - :Value, - LanItems.GetItemUdev("NAME") - ) + ChangeWidgetIfExists(Id(:device_name), :Value, device_name) ChangeWidgetIfExists(Id(:dev), :Enabled, false) if !isNewDevice ChangeWidgetIfExists( Id(:num), :ValidChars, NetworkInterfaces.ValidCharsIfcfg - ) - # ChangeWidgetIfExists(`id(`hwcfg), `ValidChars, NetworkModules::ValidCharsHwcfg ()); + ) nil end @@ -527,7 +523,6 @@ while true ret = UI.UserInput - # abort? if ret == :abort || ret == :cancel if ReallyAbort() break @@ -579,9 +574,6 @@ selected = 0 if selected == nil card = Ops.get(hwlist, selected, {}) LanItems.description = Ops.get_string(card, "name", "") - - # NetworkModules::Alias /* FIXME: MOD Lan::Module["module"] */ = card["module"]:""; - # NetworkModules::Options /* FIXME: MOD Lan::Module["options"] */ = card["options"]:""; end deep_copy(ret) @@ -604,7 +596,6 @@ ret = Ops.get_symbol(event, "WidgetID") end SelectionDialog() if ret == :list - # if (ret == `abort) LanItems::Rollback(); if ret == :pcmcia || ret == :usb || ret == :dev if UI.WidgetExists(Id(:pcmcia)) || UI.WidgetExists(Id(:usb)) if UI.QueryWidget(Id(:pcmcia), :Value) == true @@ -1163,9 +1154,6 @@ UI.SetFocus(Id(:chan_mode)) end - # FIXME: no spaces - # UI::ChangeWidget(`id(`key), `ValidChars, "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ-_:;"); - ret = nil while true if drvtype == "qeth" @@ -1290,13 +1278,11 @@ Wizard.OpenNextBackDialog Wizard.SetContents(caption, contents, initHelp, false, true) Wizard.SetAbortButton(:cancel, Label.CancelButton) - # Wizard::DisableBackButton(); ret = CWM.Run( - w, #`abort:ReallyAbort + w, {} ) Wizard.CloseDialog - # Wizard::RestoreAbortButton(); deep_copy(ret) end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.63/src/lib/network/edit_nic_name.rb new/yast2-network-3.1.64/src/lib/network/edit_nic_name.rb --- old/yast2-network-3.1.63/src/lib/network/edit_nic_name.rb 2014-06-11 14:16:14.000000000 +0200 +++ new/yast2-network-3.1.64/src/lib/network/edit_nic_name.rb 2014-06-16 15:01:45.000000000 +0200 @@ -30,8 +30,7 @@ current_item = LanItems.getCurrentItem - @old_name = LanItems.GetItemUdev("NAME") - + @old_name = LanItems.current_udev_name @old_key = MAC_UDEV_ATTR unless LanItems.GetItemUdev( MAC_UDEV_ATTR).empty? @old_key = BUSID_UDEV_ATTR unless LanItems.GetItemUdev( BUSID_UDEV_ATTR).empty? @@ -51,6 +50,7 @@ open ret = nil + new_name = @old_name while ![:cancel, :abort, :ok].include? ret ret = UI.UserInput @@ -58,15 +58,13 @@ when :ok new_name = UI.QueryWidget(:dev_name, :Value) - if new_name != @old_name - if CheckUdevNicName(new_name) - LanItems.SetCurrentName( new_name) - else - UI.SetFocus(:dev_name) - ret = nil + if CheckUdevNicName(new_name) + LanItems.rename(new_name) + else + UI.SetFocus(:dev_name) + ret = nil - next - end + next end if UI.QueryWidget(:udev_type, :CurrentButton) == :mac @@ -84,7 +82,7 @@ close - LanItems.GetCurrentName + new_name end private @@ -94,13 +92,13 @@ VBox( Left( HBox( - Label(_("Device name:")), + Label(_("Device Name:")), InputField(Id(:dev_name), Opt(:hstretch), "", @old_name) ) ), VSpacing(0.5), Frame( - _("Base udev rule on"), + _("Base Udev Rule On"), RadioButtonGroup( Id(:udev_type), VBox( @@ -150,7 +148,8 @@ # # @return [boolean] false if name is invalid def CheckUdevNicName(name) - if UsedNicName(name) + # check if the name is assigned to another device already + if UsedNicName(name) && name != LanItems.GetCurrentName Popup.Error(_("Configuration name already exists.")) return false end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.63/src/modules/Lan.rb new/yast2-network-3.1.64/src/modules/Lan.rb --- old/yast2-network-3.1.63/src/modules/Lan.rb 2014-06-11 14:16:14.000000000 +0200 +++ new/yast2-network-3.1.64/src/modules/Lan.rb 2014-06-16 15:01:45.000000000 +0200 @@ -555,17 +555,7 @@ return false if Abort() # Progress step 3 - multiple devices may be present, really plural ProgressNextStage(_("Writing device configuration...")) - if !Mode.autoinst && LanUdevAuto.AllowUdevModify - LanItems.WriteUdevRules - # wait so that ifcfgs written in NetworkInterfaces are newer - # (1-second-wise) than netcontrol status files, - # and rcnetwork reload actually works (bnc#749365) - SCR.Execute(path(".target.bash"), "udevadm settle") - Builtins.sleep(1000) - end - # hack: no "netcard" filter as biosdevname names it diferently (bnc#712232) - NetworkInterfaces.Write("") - # WriteDevices(); + LanItems.write Builtins.sleep(sl) return false if Abort() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.63/src/modules/LanItems.rb new/yast2-network-3.1.64/src/modules/LanItems.rb --- old/yast2-network-3.1.63/src/modules/LanItems.rb 2014-06-11 14:16:14.000000000 +0200 +++ new/yast2-network-3.1.64/src/modules/LanItems.rb 2014-06-16 15:01:45.000000000 +0200 @@ -333,6 +333,15 @@ ) end + # Returns name which is going to be used in the udev rule + def current_udev_name + if LanItems.current_renamed? + LanItems.current_renamed_to + else + LanItems.GetItemUdev("NAME") + end + end + # transforms given list of item ids onto device names # # item id is index into internal @Items structure @@ -549,6 +558,34 @@ SetItemName( @current, name) end + # Sets new device name for current item + def rename(name) + if(GetCurrentName() != name) + @Items[@current]["renamed_to"] = name + else + @Items[@current].delete("renamed_to") + end + end + + # Returns new name for current item + def renamed_to(item_id) + @Items[item_id]["renamed_to"] + end + + def current_renamed_to + renamed_to(@current) + end + + # Tells if current item was renamed + def renamed?(item_id) + return false if !@Items[item_id].has_key?("renamed_to") + renamed_to(item_id) != GetDeviceName(item_id) + end + + def current_renamed? + renamed?(@current) + end + # Writes udev rules for all items. # # Currently only interesting change is renaming interface. @@ -660,9 +697,28 @@ WriteUdevItemsRules() WriteUdevDriverRules() + # wait so that ifcfgs written in NetworkInterfaces are newer + # (1-second-wise) than netcontrol status files, + # and rcnetwork reload actually works (bnc#749365) + SCR.Execute(path(".target.bash"), "udevadm settle") + sleep(1) + nil end + def write + renamed_items = @Items.keys.select { |item_id| renamed?(item_id) } + renamed_items.each do |item_id| + NetworkInterfaces.Change2(renamed_to(item_id), GetDeviceMap(item_id), false) + SetItemName(item_id, renamed_to(item_id)) + end + + LanItems.WriteUdevRules if !Mode.autoinst && LanUdevAuto.AllowUdevModify + + # FIXME: hack: no "netcard" filter as biosdevname names it diferently (bnc#712232) + NetworkInterfaces.Write("") + end + # Function which returns if the settings were modified # @return [Boolean] settings were modified def GetModified @@ -1324,6 +1380,10 @@ bullets << bond_master_desc end + if renamed?(key) + note = ("%s -> %s") % [GetDeviceName(key), renamed_to(key)] + end + overview << Summary.Device(descr, status) else descr = CheckEmptyName(@type, descr) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.63/test/edit_nic_name_test.rb new/yast2-network-3.1.64/test/edit_nic_name_test.rb --- old/yast2-network-3.1.63/test/edit_nic_name_test.rb 2014-06-11 14:16:14.000000000 +0200 +++ new/yast2-network-3.1.64/test/edit_nic_name_test.rb 2014-06-16 15:01:45.000000000 +0200 @@ -25,6 +25,8 @@ # mock devices configuration LanItems.stub( :ReadHardware) { [ { "dev_name" => CURRENT_NAME } ] } LanItems.stub( :getNetworkInterfaces) { [ CURRENT_NAME ] } + LanItems.stub( :GetItemUdev) { "" } + LanItems.stub( :GetItemUdev).with("NAME") { CURRENT_NAME } # LanItems initialization Yast.import "LanItems" continue with "q"... Checked in at Mon Jun 16 15:48:31 CEST 2014 by kukuk Remember to have fun... -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org