From: foopub <foopub@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: Error with do_patch when patch already applied
Date: Fri, 05 Nov 2021 16:43:12 +0100 [thread overview]
Message-ID: <20211105154312.8MaLJI4VWLZjuxgRIvPARxvbkj1ET-bW_p7jqxVKqFk@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-33915@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1435 bytes --]
New comment by foopub on void-packages repository
https://github.com/void-linux/void-packages/issues/33915#issuecomment-962002531
Comment:
Forgot to mention above, the command was `./xbps-src pkg -o ~dbus,~wayland -j 24 firefox` on after a fresh pull and binary-bootstrap.
Even if the patches weren't previously applied, when repeating the failed build, this fails on the first patch (which previously worked) as it's not been applied:
```
=> firefox-94.0_1: running do-patch hook: 00-patches ...
=> firefox-94.0_1: patching: avoid-redefinition.patch.
Reversed (or previously applied) patch detected! Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file dom/media/webrtc/transport/third_party/nICEr/src/stun/addrs-netlink.c.rej
=> ERROR: firefox-94.0_1: do-patch_00-patches: 'patch -s ${_args} -i ${_patch} 2> /dev/null' exited with 1
=> ERROR: in _process_patch() at common/hooks/do-patch/00-patches.sh:34
=> ERROR: in hook() at common/hooks/do-patch/00-patches.sh:51
=> ERROR: in run_func() at common/xbps-src/shutils/common.sh:21
=> ERROR: in run_pkg_hooks() at common/xbps-src/shutils/common.sh:245
=> ERROR: in run_step() at common/xbps-src/shutils/common.sh:71
=> ERROR: in main() at common/xbps-src/libexec/xbps-src-dopatch.sh:33
```
One solution is to add `|& grep "Skipping patch"` or some other version of that to ignore errors cases where the patch has already been applied?
next prev parent reply other threads:[~2021-11-05 15:43 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-05 15:31 [ISSUE] " foopub
2021-11-05 15:43 ` foopub [this message]
2021-11-05 15:52 ` foopub
2021-11-05 16:13 ` foopub
2021-11-05 17:49 ` [ISSUE] [CLOSED] " q66
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211105154312.8MaLJI4VWLZjuxgRIvPARxvbkj1ET-bW_p7jqxVKqFk@z \
--to=foopub@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).