diff options
| author | Iñigo Martínez <inigomartinez@gmail.com> | 2018-01-05 09:29:23 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2018-01-09 05:58:06 +0100 |
| commit | 08a91094594fe73aa3e1a7185074a040be15e94f (patch) | |
| tree | 6df98073f5783a519bc459f95a8271276c77cacf | |
| parent | f3b4053a91e48ba56c07d70e8ac7305e2f51924f (diff) | |
| download | NetworkManager-08a91094594fe73aa3e1a7185074a040be15e94f.tar.gz | |
ifcfg: test for sysconfig network path also on meson
In a recent commit 1402fa7487b29fc1ea39a6bf7659fee7f30bb0e0 a new
way for testing Red Hat compatible distributions had been added.
However, this new approach does not use a set of files, it uses a
directory, so this test can be done by using the `test` command
and makes the `check_distro.py` script unnecessary.
https://mail.gnome.org/archives/networkmanager-list/2018-January/msg00031.html
| -rwxr-xr-x | check-distro.py | 11 | ||||
| -rw-r--r-- | meson.build | 11 |
2 files changed, 4 insertions, 18 deletions
diff --git a/check-distro.py b/check-distro.py deleted file mode 100755 index b84acac7d5..0000000000 --- a/check-distro.py +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env python3 - -import errno -import os -import sys - -for location in sys.argv[1:]: - if os.path.isfile(location): - sys.exit(0) - -sys.exit(errno.ENOENT) diff --git a/meson.build b/meson.build index 5a033dbd7f..c2b9831b63 100644 --- a/meson.build +++ b/meson.build @@ -219,16 +219,13 @@ glib_dep = declare_dependency( ] ) -check_distro = join_paths(meson.source_root(), 'check-distro.py') - -redhat_releases = ['/etc/redhat-release', '/etc/fedora-release', '/etc/mandriva-release'] -if run_command(check_distro, redhat_releases).returncode() == 0 +if run_command('test', '-e', '/etc/sysconfig/network-scripts').returncode() == 0 distro = 'redhat' -elif run_command(check_distro, '/etc/SuSE-release').returncode() == 0 +elif run_command('test', '-e', '/etc/SuSE-release').returncode() == 0 distro = 'suse' -elif run_command(check_distro, '/etc/debian_version').returncode() == 0 +elif run_command('test', '-e', '/etc/debian_version').returncode() == 0 distro = 'debian' -elif run_command(check_distro, '/etc/gentoo-release').returncode() == 0 +elif run_command('test', '-e', '/etc/gentoo-release').returncode() == 0 distro = 'gentoo' else distro = 'unknown' |