• Bug#1083123: Quick fix (2/3)

    From Hibby@1:229/2 to Hibby on Thu Oct 24 12:40:01 2024
    [continued from previous message]

    <!DOCTYPE html><html><head><title></title><style type="text/css">p.MsoNormal,p.MsoNoSpacing{margin:0}</style></head><body><div style="font-family:menlo, consolas, monospace;">Alex,<br></div><div style="font-family:menlo, consolas, monospace;"><br></div><
    div style="font-family:menlo, consolas, monospace;">I see there's a new upload this morning with updated upstream - does it address this bug?<br></div><div style="font-family:menlo, consolas, monospace;"><br></div><div style="font-family:menlo, consolas,
    monospace;">Chris,<br></div><div style="font-family:menlo, consolas, monospace;">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.<br></div><div style="font-family:
    menlo, consolas, monospace;"><br></div><div style="font-family:menlo, consolas, monospace;">[1] <a href="https://salsa.debian.org/debian/meshtastic/-/tree/master/debian?ref_type=heads">https://salsa.debian.org/debian/meshtastic/-/tree/master/debian?ref_
    type=heads</a><br></div><div style="font-family:menlo, consolas, monospace;"><b></b><br></div><div style="font-family:menlo, consolas, monospace;">Cheers,<br></div><div style="font-family:menlo, consolas, monospace;">DH<br></div><div style="font-family:
    menlo, consolas, monospace;"><br></div><div id="sig145015272"><div class="signature">--&nbsp;</div><div class="signature">&nbsp; Dave Hibberd</div><div class="signature">&nbsp; Debian Developer</div><div class="signature">&nbsp; Packet Radioist</div><div
    class="signature">&nbsp; MM0RFN</div></div><div style="font-family:menlo, consolas, monospace;"><br></div><div>On Sat, 19 Oct 2024, at 5:44 PM, Hibby wrote:<br></div><blockquote type="cite" id="qt" style=""><div style="font-family:menlo, consolas,
    monospace;">Hi All!<br></div><div style="font-family:menlo, consolas, monospace;"><br></div><div style="font-family:menlo, consolas, monospace;">Chris - thanks for the recommendation.<br></div><div style="font-family:menlo, consolas, monospace;"><br></
    <div style="font-family:menlo, consolas, monospace;">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.<br></div><div style="font-family:menlo, consolas, monospace;"><br></div><div style="font-family:menlo, consolas, monospace;">Can I also upload that version to salsa or do you have a local repo that you're maintaining you'd like to upload?<br></div><
    div style="font-family:menlo, consolas, monospace;"><br></div><div style="font-family:menlo, consolas, monospace;">Cheers,<br></div><div style="font-family:menlo, consolas, monospace;"><br></div><div style="font-family:menlo, consolas, monospace;">Hibby<
    </div><div style="font-family:menlo, consolas, monospace;"><br></div><div style="font-family:menlo, consolas, monospace;">--&nbsp;<br></div><div style="font-family:menlo, consolas, monospace;">&nbsp; Hibby<br></div><div style="font-family:menlo,
    consolas, monospace;">&nbsp; MM0RFN<br></div><div style="font-family:menlo, consolas, monospace;"><br></div><div style="font-family:menlo, consolas, monospace;">On Thu, 3 Oct 2024, at 3:20 AM, Chris Talbot wrote:<br></div><div style="font-family:menlo,
    consolas, monospace;">&gt; Hello,<br></div><div style="font-family:menlo, consolas, monospace;">&gt;<br></div><div style="font-family:menlo, consolas, monospace;">&gt; It looks like print_color is used in only one place, and the following<br></div><div
    style="font-family:menlo, consolas, monospace;">&gt; diff should get rid of the dependency:<br></div><div style="font-family:menlo, consolas, monospace;">&gt; ```<br></div><div style="font-family:menlo, consolas, monospace;">&gt; diff --git a/meshtastic/
    mesh_interface.py<br></div><div style="font-family:menlo, consolas, monospace;">&gt; b/meshtastic/mesh_interface.py<br></div><div style="font-family:menlo, consolas, monospace;">&gt; index db057a3..e8950a7 100644<br></div><div style="font-family:menlo,
    consolas, monospace;">&gt; --- a/meshtastic/mesh_interface.py<br></div><div style="font-family:menlo, consolas, monospace;">&gt; +++ b/meshtastic/mesh_interface.py<br></div><div style="font-family:menlo, consolas, monospace;">&gt; @@ -14,7 +14,6 @@ from
    decimal import Decimal<br></div><div style="font-family:menlo, consolas, monospace;">&gt;&nbsp; from typing import Any, Callable, Dict, List, Optional, Union<br></div><div style="font-family:menlo, consolas, monospace;">&gt;&nbsp;<br></div><div style="
    font-family:menlo, consolas, monospace;">&gt;&nbsp; import google.protobuf.json_format<br></div><div style="font-family:menlo, consolas, monospace;">&gt; -import print_color&nbsp; # type: ignore[import-untyped]<br></div><div style="font-family:menlo,
    consolas, monospace;">&gt;&nbsp; from pubsub import pub&nbsp; # type: ignore[import-untyped]<br></div><div style="font-family:menlo, consolas, monospace;">&gt;&nbsp; from tabulate import tabulate<br></div><div style="font-family:menlo, consolas,
    monospace;">&gt;&nbsp;<br></div><div style="font-family:menlo, consolas, monospace;">&gt; @@ -153,17 +152,7 @@ class MeshInterface:&nbsp; # pylint: disable=R0902<br></div><div style="font-family:menlo, consolas, monospace;">&gt;&nbsp;&nbsp;&nbsp;&nbsp;&
    nbsp; def _printLogLine(line, interface):<br></div><div style="font-family:menlo, consolas, monospace;">&gt;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; """Print a line of log output."""<br></div><div style="font-family:menlo, consolas,
    monospace;">&gt;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; if interface.debugOut == sys.stdout:<br></div><div style="font-family:menlo, consolas, monospace;">&gt; -&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; # this isn'
    t quite correct (could cause false positives),<br></div><div style="font-family:menlo, consolas, monospace;">&gt; but currently our formatting differs between different log<br></div><div style="font-family:menlo, consolas, monospace;">&gt;
    representations<br></div><div style="font-family:menlo, consolas, monospace;">&gt; -&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; if "DEBUG" in line:<br></div><div style="font-family:menlo, consolas, monospace;">&gt; -&nbsp;&nbsp;&
    nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; print_color.print(line, color="cyan", end=None)<br></div><div style="font-family:menlo, consolas, monospace;">&gt; -&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&
    nbsp; elif "INFO" in line:<br></div><div style="font-family:menlo, consolas, monospace;">&gt; -&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; print_color.print(line, color="white", end=None)<br></div><div style=
    "font-family:menlo, consolas, monospace;">&gt; -&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; elif "WARN" in line:<br></div><div style="font-family:menlo, consolas, monospace;">&gt; -&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&
    nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; print_color.print(line, color="yellow", end=None)<br></div><div style="font-family:menlo, consolas, monospace;">&gt; -&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; elif "ERR" in line:<br></
    <div style="font-family:menlo, consolas, monospace;">&gt; -&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; print_color.print(line, color="red", end=None)<br></div><div style="font-family:menlo, consolas,
    monospace;">&gt; -&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; else:<br></div><div style="font-family:menlo, consolas, monospace;">&gt; -&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
    print_color.print(line, end=None)<br></div><div style="font-family:menlo, consolas, monospace;">&gt; +&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; interface.debugOut.write(line + "\n")<br></div><div style="font-family:menlo,
    consolas, monospace;">&gt;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; else:<br></div><div style="font-family:menlo, consolas, monospace;">&gt;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; interface.debugOut.
    write(line + "\n")<br></div><div style="font-family:menlo, consolas, monospace;">&gt; ```<br></div><div style="font-family:menlo, consolas, monospace;">&gt;<br></div><div style="font-family:menlo, consolas, monospace;">&gt; Salsa&nbsp;<a href="https://
    salsa.debian.org/debian/meshtastic">https://salsa.debian.org/debian/meshtastic</a> appears to be empty,<br></div><div style="font-family:menlo, consolas, monospace;">&gt; else I would make this an MR myself.<br></div><div style="font-family:menlo,
    consolas, monospace;">&gt;<br></div><div style="font-family:menlo, consolas, monospace;">&gt; print-color&nbsp;<a href="https://pypi.org/project/print-color/#files">https://pypi.org/project/print-color/#files</a> looks to be a<br></div><div style="font-
    family:menlo, consolas, monospace;">&gt; simple library too, maybe statically compiling it or including it in<br></div><div style="font-family:menlo, consolas, monospace;">&gt; Debian would be easier too?<br></div><div style="font-family:menlo, consolas,
    monospace;">&gt;<br></div><div style="font-family:menlo, consolas, monospace;">&gt; --&nbsp;<br></div><div style="font-family:menlo, consolas, monospace;">&gt; Respectfully,<br></div><div style="font-family:menlo, consolas, monospace;">&gt; Chris Talbot<
    </div><div><br></div><div><b>Attachments:</b><br></div><ul><li>meshtastic_2.5.0.debdiff<br></li></ul></blockquote><div style="font-family:menlo, consolas, monospace;"><br></div></body></html>

    [continued in next message]

    --- SoupGate-Win32 v1.05
    * Origin: you cannot sedate... all the things you hate (1:229/2)