Revision 691744c4 lib/bdev.py

b/lib/bdev.py
459 459
    try:
460 460
      major = int(major)
461 461
      minor = int(minor)
462
    except ValueError, err:
462
    except (TypeError, ValueError), err:
463 463
      logging.error("lvs major/minor cannot be parsed: %s", str(err))
464 464

  
465 465
    try:
......
874 874
                  result.fail_reason, result.output)
875 875
    try:
876 876
      sectors = int(result.stdout)
877
    except ValueError:
877
    except (TypeError, ValueError):
878 878
      _ThrowError("Invalid output from blockdev: '%s'", result.stdout)
879 879
    bytes = sectors * 512
880 880
    if bytes < 128 * 1024 * 1024: # less than 128MiB

Also available in: Unified diff