Merge ~philroche/maas-images:bugfix/esm-eol-keyerror into maas-images:master

[Philip Roche]

ESM EOL code must support running on systems with older versions of python-distro-info

This was discovered when running this on Ubuntu Precise with python-distro-info 0.8.2ubuntu1
and distro-info-data 0.8ubuntu0.17

When running on a system like this the _rows attribute is used and as such the dict
key for ESM EOL is eol-esm and not eol_esm as it is on newer systems where we use a
dict representation of DistroRelease objects instead.

ESM EOL code must support running on systems with older versions of python-distro-info

This was discovered when running this on Ubuntu Precise with python-distro-info 0.8.2ubuntu1
and distro-info-data 0.8ubuntu0.17

When running on a system like this the _rows attribute is used and as such the dict
key for ESM EOL is eol-esm and not eol_esm as it is on newer systems where we use a
dict representation of DistroRelease objects instead.

[Philip Roche (philroche)]

Following on from MP https://code.launchpad.net/~philroche/maas-images/+git/maas-images/+merge/366852

I am opening this MP to add another fix for issue found in https://cloud-images-jenkins.canonical.com/job/MAAS_v2_MasterBuilder/ARCH_TYPE=amd64/1442/console

```
10:51:54 if hack_all[codename]['eol_esm']:
10:51:54 KeyError: 'eol_esm'
```

I could not replicate this locally but could when testing on a 12.04 system with ESM.

[Robert C Jennings (rcj)]

This looks sane.

review: Approve

[Andres Rodriguez (andreserl)]

Lgtm! This will need to be landed manually as there is no longer setup for this repo!

review: Approve

diff --git a/meph2/ubuntu_info.py b/meph2/ubuntu_info.py
index 032ee5f..53775be 100644
--- a/meph2/ubuntu_info.py
+++ b/meph2/ubuntu_info.py
@@ -74,18 +74,24 @@ def get_ubuntu_info(date=None):
     # hack_all, because we're using '_rows', which is not supported
     # however it is the only real way to get at EOL, and is convenient
     # series there is codename to us
+    eol_esm_key = "eol-esm"
     try:
         ubuntu_rows = udi._rows
     except AttributeError:
         ubuntu_rows = [row.__dict__ for row in udi._releases]
+        # if we are using _rows directly then the dict
+        # key for ESM eol is different to when we use a
+        # dict representation of DistroRelease objects
+        eol_esm_key = "eol_esm"
 
     hack_all = {i['series']: i for i in ubuntu_rows}
     for i, codename in enumerate(codenames):
         title = "%s LTS" % versions[i] if lts[i] else versions[i]
         eol = hack_all[codename]['eol'].strftime("%Y-%m-%d")
 
-        if hack_all[codename]['eol_esm']:
-            eol_esm = hack_all[codename]['eol_esm'].strftime("%Y-%m-%d")
+        if eol_esm_key in hack_all[codename] and \
+                hack_all[codename][eol_esm_key]:
+            eol_esm = hack_all[codename][eol_esm_key].strftime("%Y-%m-%d")
         else:
             # If eol_esm is None then this release does not receive ESM support
             # As such we should set the esm_eol to the same as eol