From ca7818317127fabb249b15cdbe2ccb73ffb682ec Mon Sep 17 00:00:00 2001
From: Anthony Young <sleepsonthefloor@gmail.com>
Date: Mon, 30 Apr 2012 14:07:15 -0700
Subject: [PATCH] Use explicit check for rpc.register_opts

---
 utils/nova-novncproxy | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/utils/nova-novncproxy b/utils/nova-novncproxy
index cc1a5075..a6fce14b 100755
--- a/utils/nova-novncproxy
+++ b/utils/nova-novncproxy
@@ -69,10 +69,8 @@ FLAGS.register_cli_opts(opts)
 
 # As of nova commit 0b11668e64450039dc071a4a123abd02206f865f we must
 # manually register the rpc library
-try:
+if hasattr(rpc, 'register_opts'):
     rpc.register_opts(FLAGS)
-except:
-    pass
 
 
 class NovaWebSocketProxy(wsproxy.WebSocketProxy):