Attachment 636283 Details for Bug 871949 – backported patch

[patch] backported patch

0001-Don-t-use-a-try-except-block-to-check-for-functions-.patch (text/plain), 1.42 KB, created by Jeffrey C. Ollie on 2012-10-31 19:51:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeffrey C. Ollie

Created: 2012-10-31 19:51:01 UTC

Size: 1.42 KB

patch

obsolete

>From d0dffb65a8a06f890cbca8e68150a2e7cec9a311 Mon Sep 17 00:00:00 2001
>From: "Jeffrey C. Ollie" <jeff@ocjtech.us>
>Date: Wed, 31 Oct 2012 13:35:12 -0500
>Subject: [PATCH 1/2] Don't use a try/except block to check for functions
> which are unavailable on the master.
>
>The try/except block here can hide attribute exceptions further down
>the call chain.  Instead, explicitly check for the function using
>hasattr so that attribute exceptions further down will trigger
>tracebacks.
>---
> salt/master.py | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
>diff --git a/salt/master.py b/salt/master.py
>index 6e348a7..27ed272 100644
>--- a/salt/master.py
>+++ b/salt/master.py
>@@ -1061,11 +1061,11 @@ class AESFuncs(object):
>         if func.startswith('__'):
>             return self.crypticle.dumps({})
>         # Run the func
>-        try:
>+        if hasattr(self, func):
>             ret = getattr(self, func)(load)
>-        except AttributeError as exc:
>-            log.error(('Received function {0} which in unavailable on the '
>-                       'master, returning False').format(exc))
>+        else:
>+            log.error(('Received function {0} which is unavailable on the '
>+                       'master, returning False').format(func))
>             return self.crypticle.dumps(False)
>         # Don't encrypt the return value for the _return func
>         # (we don't care about the return value, so why encrypt it?)
>-- 
>1.7.12.1
>

Actions: View | Diff

Attachments on bug 871949: 636283 | 636288