Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
ansible
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
OpenEdx
ansible
Commits
e8b33636
Commit
e8b33636
authored
Apr 15, 2014
by
James Cammarata
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Get the bin path for commands in the unarchive module
Fixes #6927
parent
a5e7492c
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
6 deletions
+15
-6
library/files/unarchive
+15
-6
No files found.
library/files/unarchive
View file @
e8b33636
...
...
@@ -81,17 +81,20 @@ class ZipFile(object):
self
.
src
=
src
self
.
dest
=
dest
self
.
module
=
module
self
.
cmd_path
=
self
.
module
.
get_bin_path
(
'unzip'
)
def
is_unarchived
(
self
):
return
dict
(
unarchived
=
False
)
def
unarchive
(
self
):
cmd
=
'
unzip -o "
%
s" -d "
%
s"'
%
(
self
.
src
,
self
.
dest
)
cmd
=
'
%
s -o "
%
s" -d "
%
s"'
%
(
self
.
cmd_path
,
self
.
src
,
self
.
dest
)
rc
,
out
,
err
=
self
.
module
.
run_command
(
cmd
)
return
dict
(
cmd
=
cmd
,
rc
=
rc
,
out
=
out
,
err
=
err
)
def
can_handle_archive
(
self
):
cmd
=
'unzip -l "
%
s"'
%
self
.
src
if
not
self
.
cmd_path
:
return
False
cmd
=
'
%
s -l "
%
s"'
%
(
self
.
cmd_path
,
self
.
src
)
rc
,
out
,
err
=
self
.
module
.
run_command
(
cmd
)
if
rc
==
0
:
return
True
...
...
@@ -105,23 +108,26 @@ class TgzFile(object):
self
.
src
=
src
self
.
dest
=
dest
self
.
module
=
module
self
.
cmd_path
=
self
.
module
.
get_bin_path
(
'tar'
)
self
.
zipflag
=
'z'
def
is_unarchived
(
self
):
dirof
=
os
.
path
.
dirname
(
self
.
dest
)
destbase
=
os
.
path
.
basename
(
self
.
dest
)
cmd
=
'
tar -v -C "
%
s" --diff -
%
sf "
%
s"'
%
(
self
.
dest
,
self
.
zipflag
,
self
.
src
)
cmd
=
'
%
s -v -C "
%
s" --diff -
%
sf "
%
s"'
%
(
self
.
cmd_path
,
self
.
dest
,
self
.
zipflag
,
self
.
src
)
rc
,
out
,
err
=
self
.
module
.
run_command
(
cmd
)
unarchived
=
(
rc
==
0
)
return
dict
(
unarchived
=
unarchived
,
rc
=
rc
,
out
=
out
,
err
=
err
,
cmd
=
cmd
)
def
unarchive
(
self
):
cmd
=
'
tar -C "
%
s" -x
%
sf "
%
s"'
%
(
self
.
dest
,
self
.
zipflag
,
self
.
src
)
cmd
=
'
%
s -C "
%
s" -x
%
sf "
%
s"'
%
(
self
.
cmd_path
,
self
.
dest
,
self
.
zipflag
,
self
.
src
)
rc
,
out
,
err
=
self
.
module
.
run_command
(
cmd
)
return
dict
(
cmd
=
cmd
,
rc
=
rc
,
out
=
out
,
err
=
err
)
def
can_handle_archive
(
self
):
cmd
=
'tar -t
%
sf "
%
s"'
%
(
self
.
zipflag
,
self
.
src
)
if
not
self
.
cmd_path
:
return
False
cmd
=
'
%
s -t
%
sf "
%
s"'
%
(
self
.
cmd_path
,
self
.
zipflag
,
self
.
src
)
rc
,
out
,
err
=
self
.
module
.
run_command
(
cmd
)
if
rc
==
0
:
if
len
(
out
.
splitlines
(
True
))
>
0
:
...
...
@@ -135,6 +141,7 @@ class TarFile(TgzFile):
self
.
src
=
src
self
.
dest
=
dest
self
.
module
=
module
self
.
cmd_path
=
self
.
module
.
get_bin_path
(
'tar'
)
self
.
zipflag
=
''
...
...
@@ -144,6 +151,7 @@ class TarBzip(TgzFile):
self
.
src
=
src
self
.
dest
=
dest
self
.
module
=
module
self
.
cmd_path
=
self
.
module
.
get_bin_path
(
'tar'
)
self
.
zipflag
=
'j'
...
...
@@ -153,6 +161,7 @@ class TarXz(TgzFile):
self
.
src
=
src
self
.
dest
=
dest
self
.
module
=
module
self
.
cmd_path
=
self
.
module
.
get_bin_path
(
'tar'
)
self
.
zipflag
=
'J'
...
...
@@ -163,7 +172,7 @@ def pick_handler(src, dest, module):
obj
=
handler
(
src
,
dest
,
module
)
if
obj
.
can_handle_archive
():
return
obj
raise
RuntimeError
(
'Failed to find handler to unarchive "
%
s"'
%
src
)
module
.
fail_json
(
msg
=
'Failed to find handler to unarchive. Make sure the required command to extract the file is installed.'
)
def
main
():
...
...
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