Revision 2e5c33db lib/cmdlib.py

b/lib/cmdlib.py
468 468
  #: Attribute holding field definitions
469 469
  FIELDS = None
470 470

  
471
  def __init__(self, filter_, fields, use_locking):
471
  def __init__(self, qfilter, fields, use_locking):
472 472
    """Initializes this class.
473 473

  
474 474
    """
475 475
    self.use_locking = use_locking
476 476

  
477
    self.query = query.Query(self.FIELDS, fields, filter_=filter_,
477
    self.query = query.Query(self.FIELDS, fields, qfilter=qfilter,
478 478
                             namefield="name")
479 479
    self.requested_data = self.query.RequestedData()
480 480
    self.names = self.query.RequestedNames()
......
4820 4820
  def CheckArguments(self):
4821 4821
    qcls = _GetQueryImplementation(self.op.what)
4822 4822

  
4823
    self.impl = qcls(self.op.filter, self.op.fields, self.op.use_locking)
4823
    self.impl = qcls(self.op.qfilter, self.op.fields, self.op.use_locking)
4824 4824

  
4825 4825
  def ExpandNames(self):
4826 4826
    self.impl.ExpandNames(self)

Also available in: Unified diff