On Mon, 1 Sep 2014 22:26:40 -0700 Brian Dolbec <[email protected]> wrote:
> On Mon, 1 Sep 2014 22:06:34 -0700 > "W. Trevor King" <[email protected]> wrote: > > > > > What are the symptoms of the bug this fixes? How do I trigger it in > > Catalysts without this patch? > > > > Cheers, > > Trevor > > > > Yeah, sorry, I was leaving those in place while fixing rebase > errors... it helps to find them. I'll clean them out once review is > done. > > This is only half the original problem. The other half is fixed in a > previous commit. What it orginally did was assign destdir with a > leading '.' then when I made some other seemingly unrelated change, > moving the '.' from the assignment to the usage fixed the relative > path issue. It drove me nuts trying to find it. > Here is the full change, already in the 2.X branch and 2.0.17 release. diff --git a/targets/support/functions.sh b/targets/support/functions.sh index 311ed7b..fba855c 100755 @@ -20,7 +20,7 @@ exec_in_chroot(){ # and executes it. local file_name=$(basename ${1}) local subdir=${2} - local destdir=".${subdir}/tmp" + local destdir="${subdir}/tmp" echo "Copying ${file_name} to ${destdir}" copy_to_chroot ${1} ${destdir} @@ -33,7 +33,7 @@ exec_in_chroot(){ chmod +x ${chroot_path}/${destdir}/${file_name} echo "Running ${file_name} in chroot ${chroot_path}" - ${clst_CHROOT} ${chroot_path} ${destdir}/${file_name} || exit 1 + ${clst_CHROOT} ${chroot_path} .${destdir}/${file_name} || exit 1 delete_from_chroot ${destdir}/${file_name} -- Brian Dolbec <dolsen>
signature.asc
Description: PGP signature
