Revision 8d5795b4 snf-cyclades-app/synnefo/logic/rapi.py

b/snf-cyclades-app/synnefo/logic/rapi.py
460 460 

  		





  461
  461
  
    
      conflicts = set(kwargs.iterkeys()) & set(body.iterkeys())


  		





  462
  462
  
    
      if conflicts:


  		





  463
  
  
    
        raise GanetiApiError("Required fields can not be specified as"


  		





  
  463
  
    
        raise GanetiApiError("Required fields cannot be specified as"


  		





  464
  464
  
    
                             " keywords: %s" % ", ".join(conflicts))


  		





  465
  465
  
    

  		





  466
  466
  
    
      body.update((key, value) for key, value in kwargs.iteritems()


  		












Also available in:
  Unified diff