for myfile in copy_files:
grml_file = search_file(myfile, iso_mount)
if grml_file is None:
- logging.warn("Warning: myfile %s could not be found - can not install it", myfile)
+ logging.warn("Warning: file %s could not be found - can not install it", myfile)
else:
exec_rsync(grml_file, grml_target + myfile)
for myfile in 'index.html', 'style.css':
grml_file = search_file(myfile, iso_mount)
if grml_file is None:
- logging.warn("Warning: myfile %s could not be found - can not install it")
+ logging.warn("Warning: file %s could not be found - can not install it", myfile)
else:
exec_rsync(grml_file, grml_web_target + myfile)
for myfile in 'button.png', 'favicon.png', 'linux.jpg', 'logo.png':
grml_file = search_file(myfile, iso_mount)
if grml_file is None:
- logging.warn("Warning: myfile %s could not be found - can not install it")
+ logging.warn("Warning: file %s could not be found - can not install it", myfile)
else:
exec_rsync(grml_file, grml_webimg_target + myfile)
-def handle_addon_copy(filename, dst, iso_mount):
+def handle_addon_copy(filename, dst, iso_mount, ignore_errors=False):
"""handle copy of optional addons
@filename: filename of the addon
@dst: destination directory
@iso_mount: location of the iso mount
+ @ignore_errors: don't report missing files
"""
file_location = search_file(filename, iso_mount)
if file_location is None:
- logging.warn("Warning: %s not found (that's fine if you don't need it)", filename)
+ if not ignore_errors:
+ logging.warn("Warning: %s not found (that's fine if you don't need it)", filename)
else:
exec_rsync(file_location, dst)
handle_addon_copy('memtest', addons, iso_mount)
# gpxe.lkrn: got replaced by ipxe
- handle_addon_copy('gpxe.lkrn', addons, iso_mount)
+ handle_addon_copy('gpxe.lkrn', addons, iso_mount, ignore_errors=True)
# ipxe.lkrn
handle_addon_copy('ipxe.lkrn', addons, iso_mount)