[PATCH 6/8] Don't fail on invalid network --device kickstart specification.

Vratislav Podzimek vpodzime at redhat.com
Tue Jan 29 13:52:46 UTC 2013


On Tue, 2013-01-29 at 13:10 +0100, Radek Vykydal wrote:
> We can get also
> org.freedesktop.DBus.Error.AccessDenied exception
> ---
>  pyanaconda/isys/__init__.py | 12 ++++++------
>  pyanaconda/network.py       |  4 +++-
>  2 files changed, 9 insertions(+), 7 deletions(-)
> 
> diff --git a/pyanaconda/isys/__init__.py b/pyanaconda/isys/__init__.py
> index 7f4bcb4..998b401 100755
> --- a/pyanaconda/isys/__init__.py
> +++ b/pyanaconda/isys/__init__.py
> @@ -146,21 +146,21 @@ def getDeviceProperties(dev=None):
>      else:
>          return None
>  
> -# Get the MAC address for a network device.
>  def getMacAddress(dev):
> +    """Return MAC address of device. "" if not found"""
>      if dev == '' or dev is None:
> -        return False
> +        return ""
>  
>      device_props_iface = getDeviceProperties(dev=dev)
>      if device_props_iface is None:
> -        return None
> +        return ""
>  
> -    device_macaddr = None
> +    device_macaddr = ""
>      try:
>          device_macaddr = device_props_iface.Get(NM_DEVICE_WIRED_IFACE, "HwAddress").upper()
>      except dbus.exceptions.DBusException as e:
> -        if e.get_dbus_name() != 'org.freedesktop.DBus.Error.InvalidArgs':
> -            raise
> +        log.debug("getMacAddress %s: %s" % (dev, e))
> +        pass
'pass' is not necessary, here. Some leftover? :)

-- 
Vratislav Podzimek

Anaconda Rider | Red Hat, Inc. | Brno - Czech Republic



More information about the anaconda-patches mailing list