Import patches-unapplied version 2.2.12-0ubuntu1 to ubuntu/artful-proposed

Imported using git-ubuntu import.

Changelog parent: 473ad6fbfe0b9c3b362b530492928303f2b4c7f3

New changelog entries:
  * New upstream release (LP: #1690854).
    - Refreshed debian/patches/disable_import_test.patch.

1 files changed, 30 insertions, 3 deletions

diff --git a/azurelinuxagent/common/exception.py b/azurelinuxagent/common/exception.py
index 457490c..7a0c75e 100644
--- a/azurelinuxagent/common/exception.py
+++ b/azurelinuxagent/common/exception.py
@@ -20,104 +20,131 @@
 Defines all exceptions
 """
 
+
 class AgentError(Exception):
     """
     Base class of agent error.
     """
+
     def __init__(self, errno, msg, inner=None):
-        msg = u"({0}){1}".format(errno, msg)
+        msg = u"[{0}] {1}".format(errno, msg)
         if inner is not None:
-            msg = u"{0} \n  inner error: {1}".format(msg, inner)
+            msg = u"{0}\nInner error: {1}".format(msg, inner)
         super(AgentError, self).__init__(msg)
 
+
 class AgentConfigError(AgentError):
     """
     When configure file is not found or malformed.
     """
+
     def __init__(self, msg=None, inner=None):
         super(AgentConfigError, self).__init__('000001', msg, inner)
 
+
 class AgentNetworkError(AgentError):
     """
     When network is not avaiable.
     """
+
     def __init__(self, msg=None, inner=None):
         super(AgentNetworkError, self).__init__('000002', msg, inner)
 
+
 class ExtensionError(AgentError):
     """
     When failed to execute an extension
     """
+
     def __init__(self, msg=None, inner=None):
         super(ExtensionError, self).__init__('000003', msg, inner)
 
+
 class ProvisionError(AgentError):
     """
     When provision failed
     """
+
     def __init__(self, msg=None, inner=None):
         super(ProvisionError, self).__init__('000004', msg, inner)
 
+
 class ResourceDiskError(AgentError):
     """
     Mount resource disk failed
     """
+
     def __init__(self, msg=None, inner=None):
         super(ResourceDiskError, self).__init__('000005', msg, inner)
 
+
 class DhcpError(AgentError):
     """
     Failed to handle dhcp response
     """
+
     def __init__(self, msg=None, inner=None):
         super(DhcpError, self).__init__('000006', msg, inner)
 
+
 class OSUtilError(AgentError):
     """
     Failed to perform operation to OS configuration
     """
+
     def __init__(self, msg=None, inner=None):
         super(OSUtilError, self).__init__('000007', msg, inner)
 
+
 class ProtocolError(AgentError):
     """
     Azure protocol error
     """
+
     def __init__(self, msg=None, inner=None):
         super(ProtocolError, self).__init__('000008', msg, inner)
 
+
 class ProtocolNotFoundError(ProtocolError):
     """
     Azure protocol endpoint not found
     """
+
     def __init__(self, msg=None, inner=None):
         super(ProtocolNotFoundError, self).__init__(msg, inner)
 
+
 class HttpError(AgentError):
     """
     Http request failure
     """
+
     def __init__(self, msg=None, inner=None):
         super(HttpError, self).__init__('000009', msg, inner)
 
+
 class EventError(AgentError):
     """
     Event reporting error
     """
+
     def __init__(self, msg=None, inner=None):
         super(EventError, self).__init__('000010', msg, inner)
 
+
 class CryptError(AgentError):
     """
     Encrypt/Decrypt error
     """
+
     def __init__(self, msg=None, inner=None):
         super(CryptError, self).__init__('000011', msg, inner)
 
+
 class UpdateError(AgentError):
     """
     Update Guest Agent error
     """
+
     def __init__(self, msg=None, inner=None):
         super(UpdateError, self).__init__('000012', msg, inner)
-