Revision 085b8e24

b/lib/block/drbd.py
320 320 
    if meta is not None:
321 321 
      retval = retval and ("meta_dev" in info and
322 322 
                           info["meta_dev"] == meta.dev_path)
323 
      retval = retval and ("meta_index" in info and
324 
                           info["meta_index"] == 0)
323 
      if "meta_index" in info:
324 
        retval = retval and info["meta_index"] == 0
325 325 
    else:
326 326 
      retval = retval and ("meta_dev" not in info and
327 327 
                           "meta_index" not in info)
......
830 830 
        # no local disk, but network attached and it matches
831 831 
        self._AssembleLocal(minor, self._children[0].dev_path,
832 832 
                            self._children[1].dev_path, self.size)
833 
        if self._MatchesNet(self._GetShowInfo(minor)):
833 
        if self._MatchesLocal(self._GetShowInfo(minor)):
834 834 
          break
835 835 
        else:
836 836 
          base.ThrowError("drbd%d: disk attach successful, but 'drbdsetup"
b/lib/block/drbd_info.py
442 442 
            for inner in lst[1:]:
443 443 
              if inner[0] == "disk" and len(inner) == 2:
444 444 
                retval["local_dev"] = inner[1]
445 
              elif inner[0] == "meta-disk" and len(inner) == 3:
446 
                retval["meta_dev"] = inner[1]
447 
                retval["meta_index"] = inner[2]
445 
              elif inner[0] == "meta-disk":
446 
                if len(inner) > 1:
447 
                  retval["meta_dev"] = inner[1]
448 
                if len(inner) > 2:
449 
                  retval["meta_index"] = inner[2]
448 450 
      elif sname == "_remote_host":
449 451 
        for lst in section[1:]:
450 452 
          if lst[0] == "address":

Also available in: Unified diff