Commit 95566f36 authored by David Côté-Tremblay's avatar David Côté-Tremblay Committed by Alexandre Viau

make_ring.py: fix Debian detection

Debian 8 in /etc/os-release with choose_distribution()
now returns "Debian" instead of "Debian GNU/Linux"

Change-Id: I1e23a320a71f326a961eb0fe64bc394d763fc656
Reviewed-by: default avatarAlexandre Viau <alexandre.viau@savoirfairelinux.com>
parent 7a6c7d8d
......@@ -360,7 +360,7 @@ def validate_args(parsed_args):
supported_distros = ['Android', 'Ubuntu', 'Debian', 'OSX', 'Fedora', 'Arch Linux', 'openSUSE', 'Automatic', 'mingw32', 'mingw64']
if parsed_args.distribution not in supported_distros:
print('Distribution not supported.\nChoose one of: %s' \
print('Distribution \''+parsed_args.distribution+'\' not supported.\nChoose one of: %s' \
% ', '.join(supported_distros),
file=sys.stderr)
sys.exit(1)
......@@ -417,7 +417,7 @@ def choose_distribution():
for line in f:
k,v = line.split("=")
if k.strip() == 'NAME':
return v.strip().replace('"','')
return v.strip().replace('"','').split(' ')[0]
elif system == "darwin":
return 'OSX'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment