diff -Nru maas-2.0.0~rc2+bzr5156/debian/changelog maas-2.0.0~rc2+bzr5156/debian/changelog --- maas-2.0.0~rc2+bzr5156/debian/changelog 2016-07-13 02:26:06.000000000 +0000 +++ maas-2.0.0~rc2+bzr5156/debian/changelog 2016-07-18 21:21:03.000000000 +0000 @@ -1,3 +1,11 @@ +maas (2.0.0~rc2+bzr5156-0ubuntu1~16.04.2) xenial-proposed; urgency=medium + + * debian/patches/lp1604128_workaround_python_lp1604147: Work around a + regression in the recent update to Python 3.5.2 that lost the + pathlib.Path.path property. (LP: #1604128) + + -- Andres Rodriguez Mon, 18 Jul 2016 16:56:26 -0400 + maas (2.0.0~rc2+bzr5156-0ubuntu1~16.04.1) xenial-proposed; urgency=medium * New upstream bugfix release, 2.0.0 RC2 bzr5143 (LP: #1599523): diff -Nru maas-2.0.0~rc2+bzr5156/debian/patches/lp1604128_workaround_python_lp1604147.patch maas-2.0.0~rc2+bzr5156/debian/patches/lp1604128_workaround_python_lp1604147.patch --- maas-2.0.0~rc2+bzr5156/debian/patches/lp1604128_workaround_python_lp1604147.patch 1970-01-01 00:00:00.000000000 +0000 +++ maas-2.0.0~rc2+bzr5156/debian/patches/lp1604128_workaround_python_lp1604147.patch 2016-07-18 21:03:22.000000000 +0000 @@ -0,0 +1,22 @@ +Index: maas-2.0.0~rc2+bzr5156.orig/src/provisioningserver/utils/sshkey.py +=================================================================== +--- maas-2.0.0~rc2+bzr5156.orig.orig/src/provisioningserver/utils/sshkey.py ++++ maas-2.0.0~rc2+bzr5156.orig/src/provisioningserver/utils/sshkey.py +@@ -136,7 +136,7 @@ def normalise_openssh_public_key(keytext + try: + with open(os.devnull, "r") as devnull: + rfc4716key = check_output( +- ("setsid", "-w", "ssh-keygen", "-e", "-f", keypath.path), ++ ("setsid", "-w", "ssh-keygen", "-e", "-f", str(keypath)), + stdin=devnull, stderr=PIPE, env=env) + except CalledProcessError: + raise OpenSSHKeyError( +@@ -146,7 +146,7 @@ def normalise_openssh_public_key(keytext + try: + with open(os.devnull, "r") as devnull: + opensshkey = check_output( +- ("setsid", "-w", "ssh-keygen", "-i", "-f", keypath.path), ++ ("setsid", "-w", "ssh-keygen", "-i", "-f", str(keypath.path)), + stdin=devnull, stderr=PIPE, env=env) + except CalledProcessError: + # If this happens it /might/ be an OpenSSH bug. If we've managed diff -Nru maas-2.0.0~rc2+bzr5156/debian/patches/series maas-2.0.0~rc2+bzr5156/debian/patches/series --- maas-2.0.0~rc2+bzr5156/debian/patches/series 2016-07-13 01:05:27.000000000 +0000 +++ maas-2.0.0~rc2+bzr5156/debian/patches/series 2016-07-18 21:01:43.000000000 +0000 @@ -0,0 +1 @@ +lp1604128_workaround_python_lp1604147.patch