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
5c9f867c
Commit
5c9f867c
authored
Mar 10, 2015
by
Brian Coca
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #10418 from pyroscope/fix-raspbian-distribution_release
Handle /etc/os-release files with 'Raspbian' in them
parents
2da8a986
d0197195
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
3 deletions
+2
-3
lib/ansible/module_utils/facts.py
+2
-3
No files found.
lib/ansible/module_utils/facts.py
View file @
5c9f867c
...
...
@@ -232,7 +232,7 @@ class Facts(object):
RedHat
=
'RedHat'
,
Fedora
=
'RedHat'
,
CentOS
=
'RedHat'
,
Scientific
=
'RedHat'
,
SLC
=
'RedHat'
,
Ascendos
=
'RedHat'
,
CloudLinux
=
'RedHat'
,
PSBM
=
'RedHat'
,
OracleLinux
=
'RedHat'
,
OVS
=
'RedHat'
,
OEL
=
'RedHat'
,
Amazon
=
'RedHat'
,
XenServer
=
'RedHat'
,
Ubuntu
=
'Debian'
,
Debian
=
'Debian'
,
SLES
=
'Suse'
,
XenServer
=
'RedHat'
,
Ubuntu
=
'Debian'
,
Debian
=
'Debian'
,
Raspbian
=
'Debian'
,
SLES
=
'Suse'
,
SLED
=
'Suse'
,
openSUSE
=
'Suse'
,
SuSE
=
'Suse'
,
Gentoo
=
'Gentoo'
,
Funtoo
=
'Gentoo'
,
Archlinux
=
'Archlinux'
,
Mandriva
=
'Mandrake'
,
Mandrake
=
'Mandrake'
,
Solaris
=
'Solaris'
,
Nexenta
=
'Solaris'
,
OmniOS
=
'Solaris'
,
OpenIndiana
=
'Solaris'
,
...
...
@@ -399,7 +399,7 @@ class Facts(object):
self
.
facts
[
'distribution_version'
]
=
self
.
facts
[
'distribution_version'
]
+
'.'
+
release
.
group
(
1
)
elif
name
==
'Debian'
:
data
=
get_file_content
(
path
)
if
'Debian'
in
data
:
if
'Debian'
in
data
or
'Raspbian'
in
data
:
release
=
re
.
search
(
"PRETTY_NAME=[^(]+
\
(?([^)]+?)
\
)"
,
data
)
if
release
:
self
.
facts
[
'distribution_release'
]
=
release
.
groups
()[
0
]
...
...
@@ -2674,4 +2674,3 @@ def get_all_facts(module):
setup_result
[
'verbose_override'
]
=
True
return
setup_result
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