Merge pull request #923 from mwhudson/curtin-update

update curtin
This commit is contained in:
Michael Hudson-Doyle 2021-03-31 11:47:02 +13:00 committed by GitHub
commit 65e0984243
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 8 deletions

View File

@ -42,7 +42,7 @@ parts:
plugin: python
source-type: git
source: https://git.launchpad.net/curtin
source-tag: "21.2"
source-commit: 4339a49ee93fd99940f8e0b804227af409da82ae
python-packages:
- pyyaml==5.3.1
- oauthlib

View File

@ -1533,7 +1533,6 @@ class FilesystemModel(object):
byid = {}
objs = []
exclusions = set()
seen_multipaths = set()
for action in config:
if is_probe_data and action['type'] == 'mount':
if not action['path'].startswith(self.target):
@ -1571,12 +1570,6 @@ class FilesystemModel(object):
if is_probe_data:
kw['preserve'] = True
obj = byid[action['id']] = c(m=self, **kw)
multipath = kw.get('multipath')
if multipath:
if multipath in seen_multipaths:
exclusions.add(obj)
else:
seen_multipaths.add(multipath)
objs.append(obj)
while True: