sig_cloud/diskimage-builder
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Fix $DISTRO_NAME usage for centos7 element"

Browse Source
This commit is contained in:
Jenkins 2014-10-02 10:10:04 +00:00 committed by Gerrit Code Review
commit 42e79c4a6e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
elements/pkg-map/bin/pkg-map
View File

@ -22,7 +22,7 @@ import sys
def os_family(distro):
family = None
if distro in ['centos', 'fedora', 'rhel', 'rhel7', 'centos7']:
if distro in ['fedora', 'rhel', 'rhel7', 'centos7']:
family = 'redhat'
elif distro in ['debian', 'ubuntu']:
family = 'debian'

2
elements/svc-map/extra-data.d/10-merge-svc-map-files
View File

@ -7,7 +7,7 @@ import yaml
def os_family(distro):
"""Given a distribution, returns a operating system family."""
family = None
if distro in ['centos', 'fedora', 'rhel', 'rhel7']:
if distro in ['centos7', 'fedora', 'rhel', 'rhel7']:
family = 'redhat'
elif distro in ['debian', 'ubuntu']:
family = 'debian'