|
|
@ -533,16 +533,7 @@ class Inventory(object):
|
|
|
|
if subset_pattern is None:
|
|
|
|
if subset_pattern is None:
|
|
|
|
self._subset = None
|
|
|
|
self._subset = None
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
|
|
|
subset_patterns = self._split_pattern(subset_pattern)
|
|
|
|
subset_patterns = self._split_pattern(subset_pattern)
|
|
|
|
=======
|
|
|
|
|
|
|
|
subset_pattern = subset_pattern.replace(',',':')
|
|
|
|
|
|
|
|
subset_patterns = self._split_pattern(subset_pattern.replace(";",":"))
|
|
|
|
|
|
|
|
>>>>>>> Introduce _split_pattern to parse an "x:y:z" pattern
|
|
|
|
|
|
|
|
=======
|
|
|
|
|
|
|
|
subset_patterns = self._split_pattern(subset_pattern)
|
|
|
|
|
|
|
|
>>>>>>> Don't accept undocumented "p1;p2" patterns; note in changelog
|
|
|
|
|
|
|
|
results = []
|
|
|
|
results = []
|
|
|
|
# allow Unix style @filename data
|
|
|
|
# allow Unix style @filename data
|
|
|
|
for x in subset_patterns:
|
|
|
|
for x in subset_patterns:
|
|
|
|