Use explicit check for rpc.register_opts

ca781831 · Anthony Young · 901e5655 · ca781831
Commit ca781831 authored Apr 30, 2012 by Anthony Young
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 3 deletions

nova-novncproxy utils/nova-novncproxy +1 -3

No files found.
--- 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):