Date: Thu, 23 Jan 2020 10:58:26 -0800 From: Bryan Drewery <bdrewery@FreeBSD.org> To: Mathieu Arnold <mat@FreeBSD.org>, ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r523912 - head/Mk/Scripts Message-ID: <3b2877de-9837-fc73-ae94-70f587ec6238@FreeBSD.org> In-Reply-To: <202001230855.00N8tPoe004547@repo.freebsd.org> References: <202001230855.00N8tPoe004547@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --M8zUok2doniwKiqdnx5cfigdvTfr4qeKF Content-Type: multipart/mixed; boundary="2kaMQa4KuLnVep8YhQJEVwF7uqFztjy4P"; protected-headers="v1" From: Bryan Drewery <bdrewery@FreeBSD.org> To: Mathieu Arnold <mat@FreeBSD.org>, ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Message-ID: <3b2877de-9837-fc73-ae94-70f587ec6238@FreeBSD.org> Subject: Re: svn commit: r523912 - head/Mk/Scripts References: <202001230855.00N8tPoe004547@repo.freebsd.org> In-Reply-To: <202001230855.00N8tPoe004547@repo.freebsd.org> --2kaMQa4KuLnVep8YhQJEVwF7uqFztjy4P Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable On 1/23/2020 12:55 AM, Mathieu Arnold wrote: > Author: mat > Date: Thu Jan 23 08:55:25 2020 > New Revision: 523912 > URL: https://svnweb.freebsd.org/changeset/ports/523912 >=20 > Log: > Unbreak make makepatch. > =20 > The glob in `find ./*` is handled by the shell and actually sorts the= > files, so one needs to to ask find to sort the result, using `find -s= `. > =20 > `find ./* -maxdepth 0` is not equivalent to `find . -maxdepth 0`, the= > depth increases by one as `./x` is on level deeper than `.`. > =20 > Pointy hat: bdrewery Thanks for fixing this. I should have gotten a review or inquired about why this odd syntax was being used. It was causing makepatch to not work _at all_ on our work systems. >=20 > Modified: > head/Mk/Scripts/smart_makepatch.sh (contents, props changed) >=20 > Modified: head/Mk/Scripts/smart_makepatch.sh > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/Mk/Scripts/smart_makepatch.sh Thu Jan 23 08:55:21 2020 (r52391= 1) > +++ head/Mk/Scripts/smart_makepatch.sh Thu Jan 23 08:55:25 2020 (r52391= 2) > @@ -69,7 +69,7 @@ std_patch_filename() { > patchdir_files_list() { > if [ -d "${PATCHDIR}" ]; then > (cd ${PATCHDIR} && \ > - find . -type f -name "patch-*" -maxdepth 0 \ > + find -s . -type f -name "patch-*" -maxdepth 1 \ > 2>/dev/null | sed -e 's,^\./,,; /\.orig$/d' > ) > fi; > @@ -216,7 +216,7 @@ stage_patches() { > local P > local name > local patch_list > - patch_list=3D$(cd ${REGENNED} && find . -name "patch-*" 2>/dev/null) > + patch_list=3D$(cd ${REGENNED} && find -s . -name "patch-*" 2>/dev/nul= l) > for P in ${patch_list}; do > P=3D${P#./} > name=3D$(get_patch_name ${P}) >=20 --=20 Regards, Bryan Drewery --2kaMQa4KuLnVep8YhQJEVwF7uqFztjy4P-- --M8zUok2doniwKiqdnx5cfigdvTfr4qeKF Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- iQGTBAEBCgB9FiEE+Rc8ssOq6npcih8JNddxu25Gl88FAl4p7NhfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEY5 MTczQ0IyQzNBQUVBN0E1QzhBMUYwOTM1RDc3MUJCNkU0Njk3Q0YACgkQNddxu25G l89UUwf9EVZ28n4erLA9ieBkJLtVMsZmoIdYmAqKib+0NFioeq7aAtLsE1q+y9A9 8n5PGGgcG9rI+esFus0h9Bs+zPAn3RItRYWPDdcNkf7RJkG5CPdM+XW5u2a6ocrN tM0wxPGXzF7UydlTqSb6/aP6ILiDpteMc/bP4gytABn0ORuAjhpUqh4RlTXXjFtO twHCe3ICK4iGNQeruAWVFN7G/0yF+AVTeqrOVxcY0JrDVYv5YvuAD0QYeMI6wCTI c/T98fp1/3HCBtnJeubaQEY2h5IxIOd1P9xmVn8LGuWm90pUZG1F7gm2xN160Ga/ BcbPYypJlllkqeOUTZbyhQwPq2tB3Q== =YszI -----END PGP SIGNATURE----- --M8zUok2doniwKiqdnx5cfigdvTfr4qeKF--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?3b2877de-9837-fc73-ae94-70f587ec6238>