Skip to content
Browse files

Merge commit '4b191e34ddbd2777f7bf908d68547a2a4cf4fa78' into 9.1.0

  • Loading branch information...
2 parents c905e2d + 4b191e3 commit 9dc23ff2d24c7e2b0a3620e701675a15e3ccd24a @jhixson74 jhixson74 committed Jun 26, 2013
Showing with 14 additions and 11 deletions.
  1. +1 −1 build/nano_env
  2. +13 −10 gui/middleware/notifier.py
View
2 build/nano_env
@@ -124,7 +124,7 @@ NANO_LABEL="FreeNAS"
# Version of the software to use. This should be 8.2-BETA1, 9.0-PRERELEASE,
# etc.
-VERSION="9.1.0-BETA"
+VERSION="9.1.1-ALPHA"
# FreeBSD release we are using for this release
: ${FREEBSD_RELEASE_VERSION:="9.1-RELEASE"}
View
23 gui/middleware/notifier.py
@@ -807,19 +807,22 @@ def _started_plugins(self, jail=None, plugin=None):
def pluginjail_running(self, pjail=None):
running = False
- wlist = Warden().list()
- for wj in wlist:
- wj = WardenJail(**wj)
- if pjail and wj.host == pjail:
- if wj.type == WARDEN_TYPE_PLUGINJAIL and \
+ try:
+ wlist = Warden().list()
+ for wj in wlist:
+ wj = WardenJail(**wj)
+ if pjail and wj.host == pjail:
+ if wj.type == WARDEN_TYPE_PLUGINJAIL and \
+ wj.status == WARDEN_STATUS_RUNNING:
+ running = True
+ break
+
+ elif not pjail and wj.type == WARDEN_TYPE_PLUGINJAIL and \
wj.status == WARDEN_STATUS_RUNNING:
running = True
break
-
- elif not pjail and wj.type == WARDEN_TYPE_PLUGINJAIL and \
- wj.status == WARDEN_STATUS_RUNNING:
- running = True
- break
+ except:
+ pass
return running

0 comments on commit 9dc23ff

Please sign in to comment.
Something went wrong with that request. Please try again.