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
f14dba8b
Commit
f14dba8b
authored
Sep 05, 2014
by
James Cammarata
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't re-add galaxy deps if they've already been added for install
Fixes #8890
parent
8233522a
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
4 deletions
+7
-4
bin/ansible-galaxy
+7
-4
No files found.
bin/ansible-galaxy
View file @
f14dba8b
...
@@ -780,7 +780,7 @@ def execute_install(args, options, parser):
...
@@ -780,7 +780,7 @@ def execute_install(args, options, parser):
# we're done with the temp file, clean it up
# we're done with the temp file, clean it up
os
.
unlink
(
tmp_file
)
os
.
unlink
(
tmp_file
)
# install dependencies, if we want them
# install dependencies, if we want them
if
not
no_deps
:
if
not
no_deps
and
installed
:
if
not
role_data
:
if
not
role_data
:
role_data
=
get_role_metadata
(
role
.
get
(
"name"
),
options
)
role_data
=
get_role_metadata
(
role
.
get
(
"name"
),
options
)
role_dependencies
=
role_data
[
'dependencies'
]
role_dependencies
=
role_data
[
'dependencies'
]
...
@@ -792,12 +792,15 @@ def execute_install(args, options, parser):
...
@@ -792,12 +792,15 @@ def execute_install(args, options, parser):
else
:
else
:
dep
=
ansible
.
utils
.
role_yaml_parse
(
dep
)
dep
=
ansible
.
utils
.
role_yaml_parse
(
dep
)
if
not
get_role_metadata
(
dep
[
"name"
],
options
):
if
not
get_role_metadata
(
dep
[
"name"
],
options
):
print
'- adding dependency:
%
s'
%
dep
[
"name"
]
if
dep
not
in
roles_left
:
roles_left
.
append
(
dep
)
print
'- adding dependency:
%
s'
%
dep
[
"name"
]
roles_left
.
append
(
dep
)
else
:
print
'- dependency
%
s already pending installation.'
%
dep
[
"name"
]
else
:
else
:
print
'- dependency
%
s is already installed, skipping.'
%
dep
[
"name"
]
print
'- dependency
%
s is already installed, skipping.'
%
dep
[
"name"
]
if
not
tmp_file
or
not
installed
:
if
not
tmp_file
or
not
installed
:
if
tmp_file
:
if
tmp_file
and
installed
:
os
.
unlink
(
tmp_file
)
os
.
unlink
(
tmp_file
)
print
"-
%
s was NOT installed successfully."
%
role
.
get
(
"name"
)
print
"-
%
s was NOT installed successfully."
%
role
.
get
(
"name"
)
exit_without_ignore
(
options
)
exit_without_ignore
(
options
)
...
...
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