topology: delete output file if parsing fails.
diff mbox

Message ID 1497022422-5974-1-git-send-email-liam.r.girdwood@linux.intel.com
State New
Headers show

Commit Message

Liam Girdwood June 9, 2017, 3:33 p.m. UTC
Currently the binary output file is left when parsing fails. This confuses
GNU Make if the parsing fails and causes the compilation to partially
complete.

Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
---
 topology/topology.c | 1 +
 1 file changed, 1 insertion(+)

Comments

Takashi Iwai June 10, 2017, 9:35 a.m. UTC | #1
On Fri, 09 Jun 2017 17:33:42 +0200,
Liam Girdwood wrote:
> 
> Currently the binary output file is left when parsing fails. This confuses
> GNU Make if the parsing fails and causes the compilation to partially
> complete.
> 
> Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>

Applied, thanks.

But at the next time, please specify which repo to apply.
It took some time until I figured out it's for alsa-utils.


Takashi

> ---
>  topology/topology.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/topology/topology.c b/topology/topology.c
> index 6d876ee..097c255 100644
> --- a/topology/topology.c
> +++ b/topology/topology.c
> @@ -108,6 +108,7 @@ int main(int argc, char *argv[])
>  	if (err < 0) {
>  		fprintf(stderr, _("failed to compile context %s\n"), source_file);
>  		snd_tplg_free(snd_tplg);
> +		unlink(output_file);
>  		return 1;
>  	}
>  
> -- 
> 2.11.0
> 
> _______________________________________________
> Alsa-devel mailing list
> Alsa-devel@alsa-project.org
> http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
>
Liam Girdwood June 12, 2017, 5:44 p.m. UTC | #2
On Sat, 2017-06-10 at 11:35 +0200, Takashi Iwai wrote:
> On Fri, 09 Jun 2017 17:33:42 +0200,
> Liam Girdwood wrote:
> > 
> > Currently the binary output file is left when parsing fails. This confuses
> > GNU Make if the parsing fails and causes the compilation to partially
> > complete.
> > 
> > Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
> 
> Applied, thanks.
> 
> But at the next time, please specify which repo to apply.
> It took some time until I figured out it's for alsa-utils.

Apologies, I was doing some alsa-lib patches at the same time. This did
make me realize we do have some other similar named areas that overlap
in the kernel and in alsa-lib, but they are probably manageable for the
moment.

Thanks

Liam

Patch
diff mbox

diff --git a/topology/topology.c b/topology/topology.c
index 6d876ee..097c255 100644
--- a/topology/topology.c
+++ b/topology/topology.c
@@ -108,6 +108,7 @@  int main(int argc, char *argv[])
 	if (err < 0) {
 		fprintf(stderr, _("failed to compile context %s\n"), source_file);
 		snd_tplg_free(snd_tplg);
+		unlink(output_file);
 		return 1;
 	}