Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Steven Gueguen
slapos
Commits
a749639d
Commit
a749639d
authored
Jul 01, 2016
by
Jérome Perrin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapos.cookbook:fontconfig stop downloading fonts from instance
parent
b41f2565
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
26 deletions
+5
-26
CHANGES.rst
CHANGES.rst
+5
-0
slapos/recipe/fontconfig/__init__.py
slapos/recipe/fontconfig/__init__.py
+0
-22
slapos/recipe/fontconfig/template/onetimedownload_run.in
slapos/recipe/fontconfig/template/onetimedownload_run.in
+0
-4
No files found.
CHANGES.rst
View file @
a749639d
Changes
Changes
=======
=======
1.0.32 (unreleased)
-------------------
* Remove url-list parameter to download fonts from fontconfig instance
1.0.31 (2016-05-30)
1.0.31 (2016-05-30)
-------------------
-------------------
...
...
slapos/recipe/fontconfig/__init__.py
View file @
a749639d
...
@@ -38,8 +38,6 @@ class Recipe(GenericBaseRecipe):
...
@@ -38,8 +38,6 @@ class Recipe(GenericBaseRecipe):
font-system-folder -- fonts installed by software release
font-system-folder -- fonts installed by software release
font-folder -- location where to download fonts
font-folder -- location where to download fonts
url-list -- From where to download fonts
"""
"""
def
install
(
self
):
def
install
(
self
):
...
@@ -62,24 +60,4 @@ class Recipe(GenericBaseRecipe):
...
@@ -62,24 +60,4 @@ class Recipe(GenericBaseRecipe):
self
.
substituteTemplate
(
template_filename
,
config
))
self
.
substituteTemplate
(
template_filename
,
config
))
created_file_list
.
append
(
configuration_path
)
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
return
created_file_list
slapos/recipe/fontconfig/template/onetimedownload_run.in
deleted
100644 → 0
View file @
b41f2565
#!/bin/sh
# BEWARE: This file is operated by slapgrid
# BEWARE: It will be overwritten automatically
exec
%
(
onetimedownload_path
)
s
"%(url)s"
"%(file_path)s"
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment