Revision f037e9d7 lib/cli.py

b/lib/cli.py
2800 2800

  
2801 2801
def GenericList(resource, fields, names, unit, separator, header, cl=None,
2802 2802
                format_override=None, verbose=False, force_filter=False,
2803
                namefield=None):
2803
                namefield=None, qfilter=None):
2804 2804
  """Generic implementation for listing all items of a resource.
2805 2805

  
2806 2806
  @param resource: One of L{constants.QR_VIA_LUXI}
......
2826 2826
  @type namefield: string
2827 2827
  @param namefield: Name of field to use for simple filters (see
2828 2828
    L{qlang.MakeFilter} for details)
2829
  @type qfilter: list or None
2830
  @param qfilter: Query filter (in addition to names)
2829 2831

  
2830 2832
  """
2831 2833
  if not names:
2832 2834
    names = None
2833 2835

  
2834
  qfilter = qlang.MakeFilter(names, force_filter, namefield=namefield)
2836
  namefilter = qlang.MakeFilter(names, force_filter, namefield=namefield)
2837

  
2838
  if qfilter is None:
2839
    qfilter = namefilter
2840
  elif namefilter is not None:
2841
    qfilter = [qlang.OP_AND, namefilter, qfilter]
2835 2842

  
2836 2843
  if cl is None:
2837 2844
    cl = GetClient()

Also available in: Unified diff