Use explicit check for rpc.register_opts

2012-04-30 14:07:15 -07:00
parent c0d2e2e1f5
commit 9b315c8d40
1 changed files with 1 additions and 3 deletions
--- 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):