diff options
| author | Harmen Stoppels <harmenstoppels@gmail.com> | 2021-10-15 11:34:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-15 09:34:04 +0000 |
| commit | f8e4aa7d709e533cda0e1e46410433d408b1125e (patch) | |
| tree | b1ba7ce661f42f39d36dc192890b4338a62ad686 /lib | |
| parent | e0fbf09239fb25760e07cc984f544ddb98e61f22 (diff) | |
| download | spack-f8e4aa7d709e533cda0e1e46410433d408b1125e.tar.gz spack-f8e4aa7d709e533cda0e1e46410433d408b1125e.tar.bz2 spack-f8e4aa7d709e533cda0e1e46410433d408b1125e.tar.xz spack-f8e4aa7d709e533cda0e1e46410433d408b1125e.zip | |
Revert "Don't run lsb_release on linux (#26707)" (#26754)
This reverts commit fcac95b0654a84151ad51a9123f74e8cdfcf8d26.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/spack/external/__init__.py | 1 | ||||
| -rw-r--r-- | lib/spack/external/distro.py | 4 |
2 files changed, 1 insertions, 4 deletions
diff --git a/lib/spack/external/__init__.py b/lib/spack/external/__init__.py index 5b3e1741c8..b2acccd8cc 100644 --- a/lib/spack/external/__init__.py +++ b/lib/spack/external/__init__.py @@ -38,7 +38,6 @@ distro * Homepage: https://pypi.python.org/pypi/distro * Usage: Provides a more stable linux distribution detection. * Version: 1.0.4 (last version supporting Python 2.6) -* Note: Patched to disable lsb_release by default to improve Spack's startup time. functools --------- diff --git a/lib/spack/external/distro.py b/lib/spack/external/distro.py index 24da74e537..e3805de75f 100644 --- a/lib/spack/external/distro.py +++ b/lib/spack/external/distro.py @@ -12,8 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Spack managed modifications: use include_lsb=False by default. - """ The ``distro`` package (``distro`` stands for Linux Distribution) provides information about the Linux distribution it runs on, such as a reliable @@ -1074,7 +1072,7 @@ class LinuxDistribution(object): return distro_info -_distro = LinuxDistribution(include_lsb=False) +_distro = LinuxDistribution() def main(): |