[PR PATCH] chroot.sh: export XBPS_ALT_REPOSITORY to chroot

[PR PATCH] chroot.sh: export XBPS_ALT_REPOSITORY to chroot

[sgn]

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

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

https://github.com/sgn/void-packages chroot-alt_repository-git-worktree-fix
https://github.com/void-linux/void-packages/pull/27026

chroot.sh: export XBPS_ALT_REPOSITORY to chroot
Outside of chroot, we calcucate XBPS_ALT_REPOSITORY only to throw it
away and calculate it again inside chroot. Normally, this is not problem
except when we're working with a Git's worktree, in which case, we don't
have the access to original gitdir inside chroot.

Let's bring that value from outside of chroot into it.

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-chroot-alt_repository-git-worktree-fix-27026.patch --]
[-- Type: text/x-diff, Size: 1381 bytes --]

From 1776240bfecd827feff512c0719a8bfd8b2f4532 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 8 Dec 2020 07:12:40 +0700
Subject: [PATCH] chroot.sh: export XBPS_ALT_REPOSITORY to chroot

Outside of chroot, we calcucate XBPS_ALT_REPOSITORY only to throw it
away and calculate it again inside chroot. Normally, this is not problem
except when we're working with a Git's worktree, in which case, we don't
have the access to original gitdir inside chroot.

Let's bring that value from outside of chroot into it.
---
 common/xbps-src/shutils/chroot.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/xbps-src/shutils/chroot.sh b/common/xbps-src/shutils/chroot.sh
index ea63bf7e779..0af17c786e5 100644
--- a/common/xbps-src/shutils/chroot.sh
+++ b/common/xbps-src/shutils/chroot.sh
@@ -180,6 +180,7 @@ chroot_handler() {
             SOURCE_DATE_EPOCH="$SOURCE_DATE_EPOCH" \
             XBPS_GIT_REVS="$XBPS_GIT_REVS" \
             XBPS_ALLOW_CHROOT_BREAKOUT="$XBPS_ALLOW_CHROOT_BREAKOUT" \
+            ${XBPS_ALT_REPOSITORY:+XBPS_ALT_REPOSITORY=$XBPS_ALT_REPOSITORY} \
             $XBPS_COMMONDIR/chroot-style/${XBPS_CHROOT_CMD:=uunshare}.sh \
             $XBPS_MASTERDIR $XBPS_DISTDIR "$XBPS_HOSTDIR" "$XBPS_CHROOT_CMD_ARGS" \
             /void-packages/xbps-src $XBPS_OPTIONS $action $pkg

Re: chroot.sh: export XBPS_ALT_REPOSITORY to chroot

[sgn]

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

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/27026#issuecomment-740264541

Comment:
@Piraty @Johnnynator this was the problem I was talking on IRC some times ago.

@pullmoll  Could you check if this fix your problems in #26867?

Re: chroot.sh: export XBPS_ALT_REPOSITORY to chroot

[pullmoll]

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

New comment by pullmoll on void-packages repository

https://github.com/void-linux/void-packages/pull/27026#issuecomment-740530082

Comment:
@sgn the problem was bot reproducible so I can only watch out for it not happening again but not actively confirm it is fixed.

Re: chroot.sh: export XBPS_ALT_REPOSITORY to chroot

[pullmoll]

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

New comment by pullmoll on void-packages repository

https://github.com/void-linux/void-packages/pull/27026#issuecomment-740530082

Comment:
@sgn the problem was bot reproducible so I can only watch out for it not happening again but not actively confirm it is fixed.
I'd say merge it. Cannot be wrong to do that.

Re: chroot.sh: export XBPS_ALT_REPOSITORY to chroot

[pullmoll]

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

New comment by pullmoll on void-packages repository

https://github.com/void-linux/void-packages/pull/27026#issuecomment-740530082

Comment:
@sgn the problem was not reproducible so I can only watch out for it not happening again but not actively confirm it is fixed.
I'd say merge it. Cannot be wrong to do that.

Re: [PR PATCH] [Merged]: chroot.sh: export XBPS_ALT_REPOSITORY to chroot

[sgn]

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

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

chroot.sh: export XBPS_ALT_REPOSITORY to chroot
https://github.com/void-linux/void-packages/pull/27026

Description:
Outside of chroot, we calcucate XBPS_ALT_REPOSITORY only to throw it
away and calculate it again inside chroot. Normally, this is not problem
except when we're working with a Git's worktree, in which case, we don't
have the access to original gitdir inside chroot.

Let's bring that value from outside of chroot into it.

Re: chroot.sh: export XBPS_ALT_REPOSITORY to chroot

[Piraty]

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

New comment by Piraty on void-packages repository

https://github.com/void-linux/void-packages/pull/27026#issuecomment-742097038

Comment:
+1