diff --git a/CHANGES.rst b/CHANGES.rst index 8212c180e2f0bb4f9c610caf4595eb688d0eb90d..491edeef87a6fd39a4337a2e62f2303aadbeb29f 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,6 +1,11 @@ Changes ======= +1.0.32 (unreleased) +------------------- + + * Remove url-list parameter to download fonts from fontconfig instance + 1.0.31 (2016-05-30) ------------------- diff --git a/slapos/recipe/fontconfig/__init__.py b/slapos/recipe/fontconfig/__init__.py index d52496aec798ee58ce1c37b625a84e1b1fbcca46..1f754603f0fa096b79a1df90573e41f3f6eb0583 100644 --- a/slapos/recipe/fontconfig/__init__.py +++ b/slapos/recipe/fontconfig/__init__.py @@ -38,8 +38,6 @@ class Recipe(GenericBaseRecipe): font-system-folder -- fonts installed by software release font-folder -- location where to download fonts - - url-list -- From where to download fonts """ def install(self): @@ -62,24 +60,4 @@ class Recipe(GenericBaseRecipe): self.substituteTemplate(template_filename, config)) created_file_list.append(configuration_path) - # Instanciate onetimedownloads, one for each url - wrapper_template_location = pkg_resources.resource_filename( - __name__, os.path.join( - 'template', 'onetimedownload_run.in')) - - onetimedownload_config = {} - onetimedownload_config.update(self.options) - for index, url in enumerate(self.options['url-list'].split()): - if not url.strip(): - continue - bin_path = os.path.join(service_folder, 'onetimedownload%s' % index) - file_path = os.path.join(font_folder, '%s' % index) - onetimedownload_config['url'] = url - onetimedownload_config['file_path'] = file_path - onetimedownload_runner_path = self.createExecutable(bin_path, - self.substituteTemplate(wrapper_template_location, - onetimedownload_config)) - - created_file_list.append(onetimedownload_runner_path) - return created_file_list diff --git a/slapos/recipe/fontconfig/template/onetimedownload_run.in b/slapos/recipe/fontconfig/template/onetimedownload_run.in deleted file mode 100644 index 0060b06c0b056b8e4a7ba4ff85ee7b76c40f482c..0000000000000000000000000000000000000000 --- a/slapos/recipe/fontconfig/template/onetimedownload_run.in +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -# BEWARE: This file is operated by slapgrid -# BEWARE: It will be overwritten automatically -exec %(onetimedownload_path)s "%(url)s" "%(file_path)s"