Merge lp:~stub/charm-helpers/bug-1663184-osplatform-fail into lp:charm-helpers

[Stuart Bishop]

Travis-CI has been failing unit tests, due to osplatform.get_platform() raising RuntimeErrors. Diagnosis shows platform.linux_platform() returning debian.

This fix is really a band-aid, as is probably appropriate as platform.linux_platform() is deprecated and will not exist in Python 3.7 (and the next Ubuntu LTS).

[Cory Johns (johnsca)]

+1

review: Approve

=== modified file 'charmhelpers/osplatform.py'
--- charmhelpers/osplatform.py	2016-08-10 09:57:19 +0000
+++ charmhelpers/osplatform.py	2017-02-09 13:46:02 +0000
@@ -8,12 +8,18 @@
     will be returned (which is the name of the module).
     This string is used to decide which platform module should be imported.
     """
+    # linux_distribution is deprecated and will be removed in Python 3.7
+    # Warings *not* disabled, as we certainly need to fix this.
     tuple_platform = platform.linux_distribution()
     current_platform = tuple_platform[0]
     if "Ubuntu" in current_platform:
         return "ubuntu"
     elif "CentOS" in current_platform:
         return "centos"
+    elif "debian" in current_platform:
+        # Stock Python does not detect Ubuntu and instead returns debian.
+        # Or at least it does in some build environments like Travis CI
+        return "ubuntu"
     else:
         raise RuntimeError("This module is not supported on {}."
                            .format(current_platform))