[Toybox] [PATCH] chattr: fix exit status, redo the tests.

enh enh at google.com
Thu Feb 6 14:27:12 PST 2020


On Thu, Feb 6, 2020 at 10:26 AM Rob Landley <rob at landley.net> wrote:
>
> On 2/5/20 5:54 PM, enh via Toybox wrote:
> > The e2fsprogs chattr(1) returns failure when it fails to do what was
> > asked of it, and so should we. Fixing this then reveals a lot of issues
> > with the tests that were being accidentally swept under the carpet.
>
> Applying: chattr: fix exit status, redo the tests.
> error: patch failed: toys/other/lsattr.c:359
> error: toys/other/lsattr.c: patch does not apply
>
> Hmmm...
>
> $ patch -p1 --dry-run -i 0001-chattr-fix-exit-status-redo-the-tests.patch
> checking file tests/chattr.test
> checking file toys/other/lsattr.c
> Hunk #1 succeeded at 343 with fuzz 1 (offset -16 lines).
>
> Ah, first line of last hunk is conflicting with the patch you  poinged me about. :)

yeah, sorry. too many things going on at once. (which is usually fine,
but it's awkward when they're in the same file.)

speaking of this patch... did you forget to `git push` afterwards? i'm
seeing all the other patches, but this one with the test fixes is
still missing?

> And while figuring that out, I found out that toybox patch -x says success and
> toybox patch will apply the patch... reverting that first line to the old
> version out of the hunk. Sigh. That's a bug.

...possibly because you got distracted by this :-)

> Rob



More information about the Toybox mailing list