[phaul] Fix rpc module name change

Submitted by Cyrill Gorcunov on Dec. 2, 2016, 11:06 a.m.

Details

Message ID 1480676768-32444-1-git-send-email-gorcunov@gmail.com
State Superseded
Series "Fix rpc module name change"
Headers show

Commit Message

Cyrill Gorcunov Dec. 2, 2016, 11:06 a.m.
In criu commit f3e412f9004486cbfab285bedf8d47d421551f8a
the RPC module has been renamed to rpc_pb2.py thus we
have to reflect this change here too.

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
---
 phaul/criu_cr.py   | 2 +-
 phaul/criu_req.py  | 2 +-
 phaul/p_haul_vz.py | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

Patch hide | download patch | download mbox

diff --git a/phaul/criu_cr.py b/phaul/criu_cr.py
index 8f25cff..d5131ec 100644
--- a/phaul/criu_cr.py
+++ b/phaul/criu_cr.py
@@ -3,7 +3,7 @@ 
 #
 
 import logging
-import pycriu.rpc
+import pycriu.rpc_pb2
 import criu_req
 
 
diff --git a/phaul/criu_req.py b/phaul/criu_req.py
index 36d1e43..864f03a 100644
--- a/phaul/criu_req.py
+++ b/phaul/criu_req.py
@@ -2,7 +2,7 @@ 
 # CRIU requests creation and initialization helper methods
 #
 
-import pycriu.rpc
+import pycriu.rpc_pb2
 
 
 def _build_names(name_strings):
diff --git a/phaul/p_haul_vz.py b/phaul/p_haul_vz.py
index 7db51e7..df0231a 100644
--- a/phaul/p_haul_vz.py
+++ b/phaul/p_haul_vz.py
@@ -10,7 +10,7 @@  import criu_cr
 import criu_api
 import util
 import fs_haul_ploop
-import pycriu.rpc
+import pycriu.rpc_pb2
 
 
 vz_global_conf = "/etc/vz/vz.conf"

Comments

Cyrill Gorcunov Dec. 2, 2016, 11:14 a.m.
On Fri, Dec 02, 2016 at 02:06:08PM +0300, Cyrill Gorcunov wrote:
> In criu commit f3e412f9004486cbfab285bedf8d47d421551f8a
> the RPC module has been renamed to rpc_pb2.py thus we
> have to reflect this change here too.
> 
> Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>

As to me the former commit above is API breakage because
side projects like p.haul is simply broken now.
Tycho Andersen Dec. 2, 2016, 3:14 p.m.
On Fri, Dec 02, 2016 at 02:06:08PM +0300, Cyrill Gorcunov wrote:
> In criu commit f3e412f9004486cbfab285bedf8d47d421551f8a
> the RPC module has been renamed to rpc_pb2.py thus we
> have to reflect this change here too.
> 
> Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>

Acked-by: Tycho Andersen <tycho.andersen@canonical.com>

> ---
>  phaul/criu_cr.py   | 2 +-
>  phaul/criu_req.py  | 2 +-
>  phaul/p_haul_vz.py | 2 +-
>  3 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/phaul/criu_cr.py b/phaul/criu_cr.py
> index 8f25cff..d5131ec 100644
> --- a/phaul/criu_cr.py
> +++ b/phaul/criu_cr.py
> @@ -3,7 +3,7 @@
>  #
>  
>  import logging
> -import pycriu.rpc
> +import pycriu.rpc_pb2
>  import criu_req
>  
>  
> diff --git a/phaul/criu_req.py b/phaul/criu_req.py
> index 36d1e43..864f03a 100644
> --- a/phaul/criu_req.py
> +++ b/phaul/criu_req.py
> @@ -2,7 +2,7 @@
>  # CRIU requests creation and initialization helper methods
>  #
>  
> -import pycriu.rpc
> +import pycriu.rpc_pb2
>  
>  
>  def _build_names(name_strings):
> diff --git a/phaul/p_haul_vz.py b/phaul/p_haul_vz.py
> index 7db51e7..df0231a 100644
> --- a/phaul/p_haul_vz.py
> +++ b/phaul/p_haul_vz.py
> @@ -10,7 +10,7 @@ import criu_cr
>  import criu_api
>  import util
>  import fs_haul_ploop
> -import pycriu.rpc
> +import pycriu.rpc_pb2
>  
>  
>  vz_global_conf = "/etc/vz/vz.conf"
> -- 
> 2.7.4
>
Tycho Andersen Dec. 2, 2016, 3:15 p.m.
On Fri, Dec 02, 2016 at 02:14:11PM +0300, Cyrill Gorcunov wrote:
> On Fri, Dec 02, 2016 at 02:06:08PM +0300, Cyrill Gorcunov wrote:
> > In criu commit f3e412f9004486cbfab285bedf8d47d421551f8a
> > the RPC module has been renamed to rpc_pb2.py thus we
> > have to reflect this change here too.
> > 
> > Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
> 
> As to me the former commit above is API breakage because
> side projects like p.haul is simply broken now.

Yeah, there's no good answer here (other than protobuf not doing this
stupid check in newer versions) :(

Tycho
Cyrill Gorcunov Dec. 2, 2016, 3:28 p.m.
On Fri, Dec 02, 2016 at 08:15:11AM -0700, Tycho Andersen wrote:
> > 
> > As to me the former commit above is API breakage because
> > side projects like p.haul is simply broken now.
> 
> Yeah, there's no good answer here (other than protobuf not doing this
> stupid check in newer versions) :(

I think this issue is not _that_ critical (otherwise we would
drown in bug reports). Thus lets simply merge it and that's all ;)