| Message ID | 272c39d5bbc396b421d62030c5cb69d9b749fee3.1513279655.git.mleitner@redhat.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Headers | show |
On Thu, Dec 14, 2017 at 05:27:35PM -0200, Marcelo Ricardo Leitner wrote: > Signed-off-by: Marcelo R. Leitner <mleitner@redhat.com> > Signed-off-by: Marcelo Ricardo Leitner <mleitner@redhat.com> "double checked" :-) sorry > --- > examples/python/team_daemon.py | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/examples/python/team_daemon.py b/examples/python/team_daemon.py > index 476306ef9b24..2d2a74f2f961 100755 > --- a/examples/python/team_daemon.py > +++ b/examples/python/team_daemon.py > @@ -146,7 +146,7 @@ class TeamDaemon(object): > if port.linkup: > if (not best or > port.speed > best.speed or > - (port.speed == best.speed and port.duplex > port.duplex)): > + (port.speed == best.speed and port.duplex > best.duplex)): > best = port > if best: > self._change_active_port(active, best) > -- > 2.14.3 > _______________________________________________ > libteam mailing list -- libteam@lists.fedorahosted.org > To unsubscribe send an email to libteam-leave@lists.fedorahosted.org
Thu, Dec 14, 2017 at 08:27:35PM CET, mleitner@redhat.com wrote: >Signed-off-by: Marcelo R. Leitner <mleitner@redhat.com> >Signed-off-by: Marcelo Ricardo Leitner <mleitner@redhat.com> >--- Applying: examples: fix duplex comparison against best port .git/rebase-apply/patch:14: trailing whitespace. (port.speed == best.speed and port.duplex > best.duplex)): error: patch failed: examples/python/team_daemon.py:146 error: examples/python/team_daemon.py: patch does not apply
On Mon, Dec 18, 2017 at 12:23:40PM +0100, Jiri Pirko wrote: > Thu, Dec 14, 2017 at 08:27:35PM CET, mleitner@redhat.com wrote: > >Signed-off-by: Marcelo R. Leitner <mleitner@redhat.com> > >Signed-off-by: Marcelo Ricardo Leitner <mleitner@redhat.com> > >--- > > > Applying: examples: fix duplex comparison against best port > .git/rebase-apply/patch:14: trailing whitespace. > (port.speed == best.speed and port.duplex > best.duplex)): > error: patch failed: examples/python/team_daemon.py:146 > error: examples/python/team_daemon.py: patch does not apply I have no idea how this happened. I used git send-email directly to post it, didn't even format a patch to then send it. More interestingly, I cannot even spot where the issue is in the patch, it just looks fine. But well, I'll figure this out and re-post. Marcelo
diff --git a/examples/python/team_daemon.py b/examples/python/team_daemon.py index 476306ef9b24..2d2a74f2f961 100755 --- a/examples/python/team_daemon.py +++ b/examples/python/team_daemon.py @@ -146,7 +146,7 @@ class TeamDaemon(object): if port.linkup: if (not best or port.speed > best.speed or - (port.speed == best.speed and port.duplex > port.duplex)): + (port.speed == best.speed and port.duplex > best.duplex)): best = port if best: self._change_active_port(active, best)