cloud-init-dev team mailing list archive

[Scott Moser <smoser@xxxxxxxxxx>]

Diff comments:

> 
> === modified file 'cloudinit/util.py'
> --- cloudinit/util.py	2016-03-03 23:16:13 +0000
> +++ cloudinit/util.py	2016-03-10 17:33:14 +0000
> @@ -2140,13 +2140,20 @@
>              LOG.debug("did not find %s", dmi_key_path)
>              return None
>  
> -        key_data = load_file(dmi_key_path)
> +        key_data = load_file(dmi_key_path, decode=False)
>          if not key_data:
>              LOG.debug("%s did not return any data", dmi_key_path)
>              return None
>  
> -        LOG.debug("dmi data %s returned %s", dmi_key_path, key_data)
> -        return key_data.strip()
> +        # in the event that this is all \xff and a carriage return

done

> +        # then return '.' in its place.
> +        if key_data == b'\xff' * (len(key_data) - 1) + b'\n':
> +            key_data = b'.' * (len(key_data) - 1) + b'\n'
> +
> +        str_data = key_data.decode('utf8').strip()
> +
> +        LOG.debug("dmi data %s returned %s", dmi_key_path, str_data)
> +        return str_data
>  
>      except Exception:
>          logexc(LOG, "failed read of %s", dmi_key_path)


-- 
https://code.launchpad.net/~smoser/cloud-init/trunk.dmidecode-null/+merge/288676
Your team cloud init development team is requested to review the proposed merge of lp:~smoser/cloud-init/trunk.dmidecode-null into lp:cloud-init.