From: Chocimier <Chocimier@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] xbps-src: fix warning on file:/// mirror
Date: Fri, 13 Aug 2021 19:03:31 +0200 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-32482@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 351 bytes --]
There is a new pull request by Chocimier against master on the void-packages repository
https://github.com/Chocimier/void-packages-org XBPS_DISTFILES_MIRROR
https://github.com/void-linux/void-packages/pull/32482
xbps-src: fix warning on file:/// mirror
None
A patch file from https://github.com/void-linux/void-packages/pull/32482.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-XBPS_DISTFILES_MIRROR-32482.patch --]
[-- Type: text/x-diff, Size: 1903 bytes --]
From 885cf05a62da19de279ea3af277980c31fda7851 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 13 Aug 2021 17:56:19 +0200
Subject: [PATCH 1/2] xbps-src: source msg_warn before its first use
---
xbps-src | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/xbps-src b/xbps-src
index 086a0fe212fc..5e75926c5ad5 100755
--- a/xbps-src
+++ b/xbps-src
@@ -689,12 +689,6 @@ fi
check_build_requirements
-if [ -z "$IN_CHROOT" ]; then
- trap 'exit_func' INT TERM
- if [ -n "$XBPS_DISTFILES_MIRROR" ]; then
- setup_distfiles_mirror
- fi
-fi
#
# Read funcs from helpers
#
@@ -702,6 +696,13 @@ for f in ${XBPS_SHUTILSDIR}/*.sh; do
[ -r "$f" ] && . $f
done
+if [ -z "$IN_CHROOT" ]; then
+ trap 'exit_func' INT TERM
+ if [ -n "$XBPS_DISTFILES_MIRROR" ]; then
+ setup_distfiles_mirror
+ fi
+fi
+
reconfigure_base_chroot
#
From 99cac7216396eb0e326a21e2b984752aa13a6dc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 13 Aug 2021 18:58:39 +0200
Subject: [PATCH 2/2] xbps-src: limit warning on file:/// mirror to related
targets
---
xbps-src | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/xbps-src b/xbps-src
index 5e75926c5ad5..7fe0ac55ffd8 100755
--- a/xbps-src
+++ b/xbps-src
@@ -337,7 +337,10 @@ setup_distfiles_mirror() {
mkdir -p "$XBPS_MASTERDIR/$path"
XBPS_CHROOT_CMD_ARGS+=" -b $path:$path"
else
- msg_warn "xbps-src: File URLs ($mirror) don't work with '$XBPS_CHROOT_CMD'\n"
+ case "$XBPS_TARGET" in
+ fetch|extract|patch|configure|build|check|install|pkg|bootstrap|bootstrap-update|update-sys)
+ msg_warn "xbps-src: File URLs ($mirror) don't work with '$XBPS_CHROOT_CMD'\n"
+ esac
fi
done
}
next reply other threads:[~2021-08-13 17:03 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-13 17:03 Chocimier [this message]
2021-08-15 20:41 ` [PR REVIEW] " ericonr
2021-08-17 18:09 ` Chocimier
2021-08-17 18:09 ` [PR PATCH] [Merged]: " Chocimier
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=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-32482@inbox.vuxu.org \
--to=chocimier@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).