Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Docker-in-Docker (DinD) capabilities of public runners deactivated.
More info
Open sidebar
limbra
limbra
Commits
42fdf043
Commit
42fdf043
authored
Dec 18, 2015
by
LE GAC Renaud
Browse files
Polish comments.
parent
46ad228b
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
3 deletions
+5
-3
views/lists/index.odt
views/lists/index.odt
+5
-3
No files found.
views/lists/index.odt
View file @
42fdf043
...
...
@@ -35,12 +35,11 @@
fi.close()
#
# convert the HTML in ODT file
# the command Xvbf is available only in the server
# not in the development area
# convert the HTML in ODT file using libreoffice
#
fi_tmp = TemporaryFile()
# create the virtual X11 environment on the server
if os.path.exists('/usr/bin/Xvfb'):
cmd = "Xvbf :1 -screen 0 800x600x8 & "
cmd += "libreoffice --nologo --headless --invisible --display :1.0 --convert-to odt "
...
...
@@ -48,10 +47,13 @@
call(cmd, stdout=fi_tmp, shell=True)
# development area in which X11 is running
else:
cmd = ["libreoffice", "--headless", "--convert-to", "odt", fhtml]
call(cmd, stdout=fi_tmp)
pass
fodt = '%s.odt' % froot
if os.path.exists(fodt):
...
...
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