From d609562ceedb3ca45547dac0cd4afcbe5137eb51 Mon Sep 17 00:00:00 2001 From: Michal Filka Date: Wed, 6 May 2015 10:17:22 +0200 Subject: [PATCH] Several minor fixes --- src/include/network/lan/udev.rb | 5 +++-- src/include/network/widgets.rb | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/include/network/lan/udev.rb b/src/include/network/lan/udev.rb index 1bed8a1a2..2f26f394d 100644 --- a/src/include/network/lan/udev.rb +++ b/src/include/network/lan/udev.rb @@ -63,10 +63,11 @@ def update_udevd # its Items[i, "udev", "net"], causing jumbled names (bnc#721520) # The udev trigger will make udev write the persistent names # (which it already has done, but we have overwritten them now). - SCR.Execute( + ret = SCR.Execute( path(".target.bash"), "udevadm trigger --subsystem-match=net --action=add" - ) == 0 + ) + ret == 0 end # Removes (key,operator,value) tripplet from given udev rule. diff --git a/src/include/network/widgets.rb b/src/include/network/widgets.rb index d24552eb7..9d328a9b0 100644 --- a/src/include/network/widgets.rb +++ b/src/include/network/widgets.rb @@ -559,7 +559,7 @@ def handleDevice(items, selected) # @param [Array] itemIds list of indexes into LanItems::Items # @param [Array] enslavedIfaces list of device names of already enslaved devices def CreateSlaveItems(itemIds, enslavedIfaces) - raise ArgumentError if itemIds.nil? + raise ArgumentError, "no slave device defined" if itemIds.nil? items = []