[PR PATCH] xbps-src: don't mess with masterdir set in argv

[PR PATCH] xbps-src: don't mess with masterdir set in argv

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 1264 bytes --]

There is a new pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages xbps-src
https://github.com/void-linux/void-packages/pull/48833

xbps-src: don't mess with masterdir set in argv
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
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
-->


A patch file from https://github.com/void-linux/void-packages/pull/48833.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-xbps-src-48833.patch --]
[-- Type: text/x-diff, Size: 784 bytes --]

From 1e905ec5867eadcb30ff70a990e6759d2732535e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 19 Feb 2024 13:54:13 +0100
Subject: [PATCH] xbps-src: don't mess with masterdir set in argv

---
 xbps-src | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/xbps-src b/xbps-src
index 53fecd9bb46bd8..b3f61d53dc4787 100755
--- a/xbps-src
+++ b/xbps-src
@@ -536,6 +536,8 @@ fi
 # unless in a container for simplicity of container/CI usage
 if [ "$XBPS_CHROOT_CMD" = ethereal ]; then
     : "${XBPS_MASTERDIR:=$XBPS_DISTDIR/masterdir}"
+elif [ -n "$XBPS_ARG_MASTERDIR" ]; then
+    : # Don't mess with masterdir in argv
 else
     : "${XBPS_MASTERDIR:=$XBPS_DISTDIR/masterdir-$XBPS_MACHINE}"
     # but use $XBPS_DISTDIR/masterdir if it exists and the new style doesn't

Re: [PR PATCH] [Merged]: xbps-src: don't mess with masterdir set in argv

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 1104 bytes --]

There's a merged pull request on the void-packages repository

xbps-src: don't mess with masterdir set in argv
https://github.com/void-linux/void-packages/pull/48833

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
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
-->