Better way to fix this?

=
>From 0a2e8b4e287e24b272597bf1d2b5dfcce4d2db2e Mon Sep 17 00:00:00 2001
From: FUJITA Tomonori <[email protected]>
Date: Wed, 30 Jan 2013 10:51:36 +0900
Subject: [PATCH] of: fix hello version error printing

Fix the following error:

Traceback (most recent call last):
  File "/Users/fujita/git/ryu/ryu/controller/controller.py", line 94, in 
deactivate
    method(self)
  File "/Users/fujita/git/ryu/ryu/controller/controller.py", line 172, in 
_recv_loop
    self.ev_q.queue(ofp_event.ofp_msg_to_ev(msg))
  File "/Users/fujita/git/ryu/ryu/controller/dispatcher.py", line 109, in queue
    self._dispatcher(ev)
  File "/Users/fujita/git/ryu/ryu/controller/dispatcher.py", line 174, in 
__call__
    self.dispatch(ev)
  File "/Users/fujita/git/ryu/ryu/controller/dispatcher.py", line 191, in 
dispatch
    handled = self._dispatch(ev, self.events.get(ev.__class__, []))
  File "/Users/fujita/git/ryu/ryu/controller/dispatcher.py", line 182, in 
_dispatch
    ret = h(ev)
  File "/Users/fujita/git/ryu/ryu/controller/ofp_handler.py", line 113, in 
hello_handler
    msg.version, datapath.supported_ofp_version.keys())
TypeError: not all arguments converted during string formatting

Signed-off-by: FUJITA Tomonori <[email protected]>
---
 ryu/controller/ofp_handler.py |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ryu/controller/ofp_handler.py b/ryu/controller/ofp_handler.py
index add0301..216848c 100644
--- a/ryu/controller/ofp_handler.py
+++ b/ryu/controller/ofp_handler.py
@@ -108,10 +108,10 @@ class OFPHandler(app_manager.RyuApp):
                 return
 
         if not usable_versions:
-            error_desc = 'unsupported version 0x%x. '
-            'If possible, set the switch to use one of the versions %s' % (
+            error_desc = 'unsupported version 0x%x. ' \
+                'If possible, set the switch to use one of the versions %s' % (
                 msg.version, datapath.supported_ofp_version.keys())
-            self.hello_failed(error_desc)
+            self.hello_failed(datapath, error_desc)
             return
         datapath.set_version(max(usable_versions))
 
-- 
1.7.4.4


------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_d2d_jan
_______________________________________________
Ryu-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ryu-devel

Reply via email to