Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.recipe.build
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
2
Merge Requests
2
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
slapos.recipe.build
Commits
737a0c6b
Commit
737a0c6b
authored
Jun 07, 2022
by
Julien Muchembled
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
downloadunpacked: fix extraction of symlinks when using an external decompressor
parent
f7bfa146
Pipeline
#21963
passed with stage
in 0 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
3 deletions
+5
-3
slapos/recipe/downloadunpacked.py
slapos/recipe/downloadunpacked.py
+5
-3
No files found.
slapos/recipe/downloadunpacked.py
View file @
737a0c6b
...
@@ -29,6 +29,7 @@ import os
...
@@ -29,6 +29,7 @@ import os
import
subprocess
import
subprocess
import
tarfile
import
tarfile
import
tempfile
import
tempfile
from
functools
import
partial
from
setuptools
import
archive_util
from
setuptools
import
archive_util
from
.
import
is_true
,
EnvironMixin
,
Shared
from
.
import
is_true
,
EnvironMixin
,
Shared
...
@@ -118,8 +119,8 @@ def unpack_archive(recipe, *args):
...
@@ -118,8 +119,8 @@ def unpack_archive(recipe, *args):
with
tempfile
.
NamedTemporaryFile
()
as
uncompressed_archive
:
with
tempfile
.
NamedTemporaryFile
()
as
uncompressed_archive
:
subprocess
.
check_call
(
cmd
+
(
filename
,),
subprocess
.
check_call
(
cmd
+
(
filename
,),
stdout
=
uncompressed_archive
,
env
=
recipe
.
environ
)
stdout
=
uncompressed_archive
,
env
=
recipe
.
environ
)
archive_util
.
unpack_archive
(
unpack_archive
(
uncompressed_archive
.
name
,
uncompressed_archive
.
name
,
extract_dir
,
progress_filter
)
extract_dir
,
progress_filter
)
return
True
return
True
raise
archive_util
.
UnrecognizedFormat
(
raise
archive_util
.
UnrecognizedFormat
(
"%s is not a compressed or uncompressed tar file"
%
(
filename
,)
"%s is not a compressed or uncompressed tar file"
%
(
filename
,)
...
@@ -149,5 +150,6 @@ def unpack_archive(recipe, *args):
...
@@ -149,5 +150,6 @@ def unpack_archive(recipe, *args):
pass
pass
return
True
return
True
return
archive_util
.
unpack_archive
(
*
args
,
unpack_archive
=
partial
(
archive_util
.
unpack_archive
,
drivers
=
archive_util
.
extraction_drivers
[:
2
]
+
(
unpack_tarfile_patched
,))
drivers
=
archive_util
.
extraction_drivers
[:
2
]
+
(
unpack_tarfile_patched
,))
return
unpack_archive
(
*
args
)
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