From: paper42 <paper42@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] xbps-src: make -E ignore remote repositories with -N
Date: Wed, 15 Dec 2021 19:36:31 +0100 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-34559@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 1260 bytes --]
There is a new pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages xbps-src-EN-remote
https://github.com/void-linux/void-packages/pull/34559
xbps-src: make -E ignore remote repositories with -N
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
@Piraty
A patch file from https://github.com/void-linux/void-packages/pull/34559.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-xbps-src-EN-remote-34559.patch --]
[-- Type: text/x-diff, Size: 1607 bytes --]
From 8b55fd7d4246c86f7b27878b8348c78085f0c5f2 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 15 Dec 2021 19:34:53 +0100
Subject: [PATCH] xbps-src: make -E ignore remote repositories with -N
---
common/xbps-src/shutils/common.sh | 4 +++-
xbps-src | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/common/xbps-src/shutils/common.sh b/common/xbps-src/shutils/common.sh
index 1739124050f7..781d38b6a26b 100644
--- a/common/xbps-src/shutils/common.sh
+++ b/common/xbps-src/shutils/common.sh
@@ -470,7 +470,9 @@ setup_pkg() {
fi
makejobs="-j$XBPS_MAKEJOBS"
if [ -n "$XBPS_BINPKG_EXISTS" ]; then
- local _binpkgver="$($XBPS_QUERY_XCMD -R -ppkgver $pkgver 2>/dev/null)"
+ local extraflags=""
+ [ -n "$XBPS_SKIP_REMOTEREPOS" ] && extraflags="-i"
+ local _binpkgver="$($XBPS_QUERY_XCMD -R -ppkgver $pkgver $extraflags 2>/dev/null)"
if [ "$_binpkgver" = "$pkgver" ]; then
if [ -z "$XBPS_DEPENDENCY" ]; then
local _repo="$($XBPS_QUERY_XCMD -R -prepository $pkgver 2>/dev/null)"
diff --git a/xbps-src b/xbps-src
index ff249015ed02..28ffdaa024a8 100755
--- a/xbps-src
+++ b/xbps-src
@@ -188,7 +188,7 @@ $(print_cross_targets)
The masterdir is the main directory to build/store/compile packages.
If unset defaults to void-packages/masterdir.
--N Disable use of remote repositories to resolve dependencies.
+-N Disable use of remote repositories.
-o <opt,~opt2,...>
Enable or disable (prefixed with ~) package build options. If 'etc/conf'
next reply other threads:[~2021-12-15 18:36 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-15 18:36 paper42 [this message]
2021-12-15 20:08 ` Chocimier
2021-12-15 21:40 ` [PR PATCH] [Updated] " paper42
2021-12-15 21:40 ` paper42
2021-12-15 21:40 ` paper42
2021-12-15 23:18 ` [PR PATCH] [Updated] " paper42
2021-12-15 23:18 ` paper42
2022-04-17 17:39 ` [PR PATCH] [Merged]: " paper42
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-34559@inbox.vuxu.org \
--to=paper42@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).