[Buildroot] [PATCH 07/13 v7] support/apply-patches: bail-out on duplicate patch basenames

[Thomas Petazzoni <thomas.petazzoni@free-electrons.com>]

Hello,

On Sat,  7 May 2016 18:14:32 +0200, Yann E. MORIN wrote:
> Patches we save can come from various locations;

: instead of ; here

>   - bundled with Buildroot
>   - downloaded
>   - from one or more global-patch-dir
> 
> It is possible that two patches lying into different locations have the
> same basename, like so (first is bundled, second is from an hypothetical
> global-patch-dir):
>     package/foo/0001-fix-Makefile.patch
>     /path/to/my/patches/foo/0001-fix-Makefile.patch
> 
> In that case, when running legal-info, we'd save only the second patch,
> overwriting the first. That would be oproblematic, because:

oproblematic -> problematic

> 
>   - either the second patch depends on the first, and thus would no longer
>     apply (this is easy to detect, though),
> 
>   - or the second patch does not dpend on the first, and the compliance
>     delivery will not be complete (this is much arder to detect).

arder -> harder

> 
> We fix that by checking that no two patches have the same same basename.

same same -> same (but I forgot to fix this one, dammit)

> If we find that the basename of the patch to be applied collides with
> that of a previously applied patch, we error out and report the duplicate.
> 
> The unfortunate side-effect is that existing setups will now break in
> that situation, but that's a minor, corner-case issue that is easily
> fixed.
> 
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> Cc: Luca Ceresoli <luca@lucaceresoli.net>
> Cc: Arnout Vandecappelle <arnout@mind.be>
> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> 
> ---
> Changes v6 -> v7:
>   - reword error message
> 
> Changes v5 -> v6:
>   - don't renumber, detect collision and error out  (Luca, Arnout,
>     Thomas)
> ---
>  support/scripts/apply-patches.sh | 8 ++++++++
>  1 file changed, 8 insertions(+)
> 
> diff --git a/support/scripts/apply-patches.sh b/support/scripts/apply-patches.sh
> index 20a1552..f8b6ca3 100755
> --- a/support/scripts/apply-patches.sh
> +++ b/support/scripts/apply-patches.sh
> @@ -103,6 +103,14 @@ function apply_patch {
>          echo "Error: missing patch file ${path}/$patch"
>          exit 1
>      fi
> +    existing="$( grep -E "/${patch}\$" ${builddir}/.applied_patches_list )"

I've dropped the space after ( and before ) since it's not the typical
Buildroot coding style (though I know it's your personal coding style).

Applied with those minor typos fixed.

Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com