[elbe-devel] [PATCH v2 1/1] Remove distro informations
Torben Hohn
torben.hohn at linutronix.de
Fri Feb 7 09:05:56 CET 2020
On Wed, Feb 05, 2020 at 06:15:06PM -0500, Olivier Dion wrote:
> platform.linux_distribution is deprecated since 3.5 and removed in
> 3.8, see
> <https://docs.python.org/2/library/platform.html#platform.linux_distribution>,
> thus removing its usage.
>
> Signed-off-by: Olivier Dion <dion at linutronix.de>
this is a revert.
letme reply with my revert.
> ---
> elbe | 4 ++--
> elbepack/version.py | 3 ---
> 2 files changed, 2 insertions(+), 5 deletions(-)
>
> diff --git a/elbe b/elbe
> index 9c65f9be3..834065235 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))
^
i dont like this space
> sys.exit(0)
>
> cmd_list = get_cmdlist()
> diff --git a/elbepack/version.py b/elbepack/version.py
> index 0dfe7cddb..bd595dbca 100644
> --- a/elbepack/version.py
> +++ b/elbepack/version.py
> @@ -4,12 +4,9 @@
> #
> # 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',
> --
> 2.25.0
>
>
> _______________________________________________
> elbe-devel mailing list
> elbe-devel at linutronix.de
> https://lists.linutronix.de/mailman/listinfo/elbe-devel
--
Torben Hohn
Linutronix GmbH | Bahnhofstrasse 3 | D-88690 Uhldingen-Mühlhofen
Phone: +49 7556 25 999 18; Fax.: +49 7556 25 999 99
Hinweise zum Datenschutz finden Sie hier (Informations on data privacy
can be found here): https://linutronix.de/kontakt/Datenschutz.php
Linutronix GmbH | Firmensitz (Registered Office): Uhldingen-Mühlhofen |
Registergericht (Registration Court): Amtsgericht Freiburg i.Br., HRB700
806 | Geschäftsführer (Managing Directors): Heinz Egger, Thomas Gleixner
More information about the elbe-devel
mailing list