Revision 7a70541e lib/client/gnt_instance.py

b/lib/client/gnt_instance.py
1323 1323
        else:
1324 1324
          action = constants.DDM_MODIFY
1325 1325

  
1326
      elif add is _MISSING and remove is _MISSING:
1327
        action = constants.DDM_MODIFY
1326 1328
      else:
1327
        if add is _MISSING and remove is _MISSING:
1328
          action = constants.DDM_MODIFY
1329
        else:
1330
          raise errors.OpPrereqError("Cannot modify and add/remove at the"
1331
                                     " same time", errors.ECODE_INVAL)
1329
        raise errors.OpPrereqError("Cannot modify and add/remove at the"
1330
                                   " same time", errors.ECODE_INVAL)
1332 1331

  
1333 1332
      assert not (constants.DDMS_VALUES_WITH_MODIFY & set(params.keys()))
1334 1333

  

Also available in: Unified diff