Revision af5af644 lib/mcpu.py

b/lib/mcpu.py
535 535 
      env["GANETI_MASTER"] = cfg.GetMasterNode()
536 536 

  		





  537
  537
  
    
    if phase_env:


  		





  538
  
  
    
      assert not (set(env) & set(phase_env)), "Environment variables conflict"


  		





  539
  
  
    
      env.update(phase_env)


  		





  
  538
  
    
      env = utils.algo.JoinDisjointDicts(env, phase_env)


  		





  540
  539
  
    

  		





  541
  540
  
    
    # Convert everything to strings


  		





  542
  541
  
    
    env = dict([(str(key), str(val)) for key, val in env.iteritems()])


  		












Also available in:
  Unified diff