Revision c4feafe8 tools/cluster-merge

b/tools/cluster-merge
125 125
                                 " key from %s. Fail reason: %s; output: %s" %
126 126
                                 (cluster, result.fail_reason, result.output))
127 127

  
128
      key_path = os.path.join(self.work_dir, cluster)
128
      key_path = utils.PathJoin(self.work_dir, cluster)
129 129
      utils.WriteFile(key_path, mode=0600, data=result.stdout)
130 130

  
131 131
      result = self._RunCmd(cluster, "gnt-node list -o name --no-header",
......
254 254
                                 (data.cluster, result.fail_reason,
255 255
                                  result.output))
256 256

  
257
      data.config_path = os.path.join(self.work_dir, "%s_config.data" %
258
                                                     data.cluster)
257
      data.config_path = utils.PathJoin(self.work_dir, "%s_config.data" %
258
                                        data.cluster)
259 259
      utils.WriteFile(data.config_path, data=result.stdout)
260 260

  
261 261
  # R0201: Method could be a function

Also available in: Unified diff