mirrors/brigadier
1
0
Fork 0
mirror of https://github.com/timsutton/brigadier.git synced 2025-06-01 07:48:25 -04:00
Code Issues Projects Releases Packages Wiki Activity

Temporary fix for overlapping ESDs, to ignore BootCampAutoUnattend-tagged dist files.

Browse source
This commit is contained in:
Timothy Sutton 2013-03-15 18:36:16 -04:00
parent 4ae6989fd3
commit 8f34b78758
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
brigadier
View file

@ -173,7 +173,6 @@ when running the installer out of 'system32'." % output_dir)
bc_match = re.search('BootCamp', prod_data['ServerMetadataURL']) bc_match = re.search('BootCamp', prod_data['ServerMetadataURL'])
if bc_match: if bc_match:
bc_prods.append((prod_id, prod_data)) bc_prods.append((prod_id, prod_data))
# Find the ESD(s) that applies to our model # Find the ESD(s) that applies to our model
pkg_data = [] pkg_data = []
supported_models = [] supported_models = []
@ -184,6 +183,11 @@ when running the installer out of 'system32'." % output_dir)
disturl = bc_prod[1]['Distributions']['English'] disturl = bc_prod[1]['Distributions']['English']
distfd = urllib2.urlopen(disturl) distfd = urllib2.urlopen(disturl)
dist_data = distfd.read() dist_data = distfd.read()
# Quick and dirty hack to skip BootCampAutoUnattend we don't yet handle
if re.search('BootCampAutoUnattend', dist_data):
status("BootCampAutoUnattend tag found in %s, skipping because we don't yet handle model-overlapping "
"ESDs properly.." % bc_prod[0])
continue
if re.search(model, dist_data): if re.search(model, dist_data):
pkg_data.append({bc_prod[0]: bc_prod[1]}) pkg_data.append({bc_prod[0]: bc_prod[1]})
model_matches_in_dist = re.findall(re_model, dist_data) model_matches_in_dist = re.findall(re_model, dist_data)