[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#1083123: Quick fix



Alex,

I see there's a new upload this morning with updated upstream - does it address this bug?

Chris,
Development is happening on the master branch, not main [1] - you could try an MR against that when it's updated with this morning's upload.

[1] https://salsa.debian.org/debian/meshtastic/-/tree/master/debian?ref_type=heads

Cheers,
DH

-- 
  Dave Hibberd
  Debian Developer
  Packet Radioist
  MM0RFN

On Sat, 19 Oct 2024, at 5:44 PM, Hibby wrote:
Hi All!

Chris - thanks for the recommendation.

Alex - I've prepared an update to 2.5.0-2 and with that created the attached debdiff - am I ok to upload this as a hamradio team upload? I'll set a reminder to do it next weekend if I don't hear back.

Can I also upload that version to salsa or do you have a local repo that you're maintaining you'd like to upload?

Cheers,

Hibby

-- 
  Hibby
  MM0RFN

On Thu, 3 Oct 2024, at 3:20 AM, Chris Talbot wrote:
> Hello,
>
> It looks like print_color is used in only one place, and the following
> diff should get rid of the dependency:
> ```
> diff --git a/meshtastic/mesh_interface.py
> b/meshtastic/mesh_interface.py
> index db057a3..e8950a7 100644
> --- a/meshtastic/mesh_interface.py
> +++ b/meshtastic/mesh_interface.py
> @@ -14,7 +14,6 @@ from decimal import Decimal
>  from typing import Any, Callable, Dict, List, Optional, Union

>  import google.protobuf.json_format
> -import print_color  # type: ignore[import-untyped]
>  from pubsub import pub  # type: ignore[import-untyped]
>  from tabulate import tabulate

> @@ -153,17 +152,7 @@ class MeshInterface:  # pylint: disable=R0902
>      def _printLogLine(line, interface):
>          """Print a line of log output."""
>          if interface.debugOut == sys.stdout:
> -            # this isn't quite correct (could cause false positives),
> but currently our formatting differs between different log
> representations
> -            if "DEBUG" in line:
> -                print_color.print(line, color="cyan", end=None)
> -            elif "INFO" in line:
> -                print_color.print(line, color="white", end=None)
> -            elif "WARN" in line:
> -                print_color.print(line, color="yellow", end=None)
> -            elif "ERR" in line:
> -                print_color.print(line, color="red", end=None)
> -            else:
> -                print_color.print(line, end=None)
> +            interface.debugOut.write(line + "\n")
>          else:
>              interface.debugOut.write(line + "\n")
> ```
>
> Salsa https://salsa.debian.org/debian/meshtastic appears to be empty,
> else I would make this an MR myself.
>
> print-color https://pypi.org/project/print-color/#files looks to be a
> simple library too, maybe statically compiling it or including it in
> Debian would be easier too?
>
> -- 
> Respectfully,
> Chris Talbot

Attachments:


Reply to: