[elbe-devel] [PATCH] Revert "add running os info"

[Bastian Germann]

Am 07.02.20 um 09:07 schrieb Torben Hohn:
> OS version information is not really useful when elbe --version
> is executed, and linux_distribution does not exist anymore for python3
> 
> This reverts commit d2674f30e138178a6f5e80174ffcaf807e5112b8.
> [torbenh: fixed the conflicts, and keep the spirit of the current code]
> 
> Signed-off-by: Torben Hohn <torben.hohn at linutronix.de>

Reviewed-by: Bastian Germann <bage at linutronix.de>

> ---
>  elbe                | 4 ++--
>  elbepack/version.py | 2 --
>  2 files changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/elbe b/elbe
> index 9c65f9be3..8ba6ef1d8 100755
> --- a/elbe
> +++ b/elbe
> @@ -14,7 +14,7 @@ import os
>  import sys
>  
>  import elbepack.commands
> -from elbepack.version import elbe_version, running_os
> +from elbepack.version import elbe_version
>  from elbepack.directories import init_directories, get_cmdlist
>  
>  
> @@ -37,7 +37,7 @@ if (len(sys.argv) < 2):
>      sys.exit(20)
>  
>  if sys.argv[1] == "--version":
> -    print("elbe v %s %s %s" % (elbe_version, running_os[0], running_os[1]))
> +    print("elbe v%s" % (elbe_version))
>      sys.exit(0)
>  
>  cmd_list = get_cmdlist()
> diff --git a/elbepack/version.py b/elbepack/version.py
> index 0dfe7cddb..429e2729a 100644
> --- a/elbepack/version.py
> +++ b/elbepack/version.py
> @@ -4,12 +4,10 @@
>  #
>  # SPDX-License-Identifier: GPL-3.0-or-later
>  
> -from platform import linux_distribution
>  
>  from elbepack.directories import pack_dir
>  
>  elbe_version = "12.1"
> -running_os = linux_distribution()
>  
>  elbe_initvm_packagelist = ['python-elbe-buildenv',
>                             'elbe-soap',
>