Revision 691744c4 scripts/gnt-backup

b/scripts/gnt-backup
118 118 
  if opts.nics:
119 119 
    try:
120 120 
      nic_max = max(int(nidx[0])+1 for nidx in opts.nics)
121 
    except ValueError, err:
121 
    except (TypeError, ValueError), err:
122 122 
      raise errors.OpPrereqError("Invalid NIC index passed: %s" % str(err))
123 123 
    nics = [{}] * nic_max
124 124 
    for nidx, ndict in opts.nics:
......
146 146 
      opts.disks = [(0, {"size": opts.sd_size})]
147 147 
    try:
148 148 
      disk_max = max(int(didx[0])+1 for didx in opts.disks)
149 
    except ValueError, err:
149 
    except (TypeError, ValueError), err:
150 150 
      raise errors.OpPrereqError("Invalid disk index passed: %s" % str(err))
151 151 
    disks = [{}] * disk_max
152 152 
    for didx, ddict in opts.disks:
......
155 155 
        raise errors.OpPrereqError("Missing size for disk %d" % didx)
156 156 
      try:
157 157 
        ddict["size"] = utils.ParseUnit(ddict["size"])
158 
      except ValueError, err:
158 
      except (TypeError, ValueError), err:
159 159 
        raise errors.OpPrereqError("Invalid disk size for disk %d: %s" %
160 160 
                                   (didx, err))
161 161 
      disks[didx] = ddict

Also available in: Unified diff