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
f5d7005e
Commit
f5d7005e
authored
Oct 19, 2012
by
Michael DeHaan
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1387 from skvidal/devel
when a pkg is installed, but not from any repo, don't error out
parents
84f48562
33be7526
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
1 deletions
+5
-1
library/yum
+5
-1
No files found.
library/yum
View file @
f5d7005e
...
...
@@ -212,7 +212,10 @@ def what_provides(module, repoq, req_spec, conf_file, qf=def_qf):
rc2
,
out2
,
err2
=
run
(
cmd
)
if
rc
==
0
and
rc2
==
0
:
out
+=
out2
return
set
([
p
for
p
in
out
.
split
(
'
\n
'
)
if
p
.
strip
()
])
pkgs
=
set
([
p
for
p
in
out
.
split
(
'
\n
'
)
if
p
.
strip
()
])
if
not
pkgs
:
pkgs
=
is_installed
(
module
,
repoq
,
req_spec
,
conf_file
,
qf
=
qf
)
return
pkgs
else
:
module
.
fail_json
(
msg
=
'Error from repoquery:
%
s'
%
err
+
err2
)
...
...
@@ -350,6 +353,7 @@ def install(module, items, repoq, yum_basecmd, conf_file):
if
is_installed
(
module
,
repoq
,
this
,
conf_file
):
found
=
True
res
[
'results'
]
.
append
(
'
%
s providing
%
s is already installed'
%
(
this
,
spec
))
break
if
found
:
continue
...
...
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