From b5e24ca3bdd371aa72e8bd095f86f0b3cbfbbee1 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Wed, 17 Jul 2019 02:03:55 +0100 Subject: dgit-repos-server: Don't crash on --quilt=baredebian The die needs to be qualified. This little bit of fcode has never worked. Signed-off-by: Ian Jackson --- infra/dgit-repos-server | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'infra/dgit-repos-server') diff --git a/infra/dgit-repos-server b/infra/dgit-repos-server index 2b20d1e..177829e 100755 --- a/infra/dgit-repos-server +++ b/infra/dgit-repos-server @@ -1282,7 +1282,8 @@ END if (defined $quilt) { push @dgitcmd, "--quilt=$quilt"; if ($quilt =~ m/baredebian/) { - die "needed upstream commmitish with --quilt=baredebian"; + die "needed upstream commmitish with --quilt=baredebian" + unless defined $upstreamc; push @dgitcmd, "--upstream-commitish=$upstreamc"; } } -- cgit v1.2.3 From 420f315dfc9e7f9ce03cd82b5926a04f92d755ee Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Wed, 17 Jul 2019 02:46:58 +0100 Subject: dgit-repos-server: parsetag: Print a bit more debug about junk Signed-off-by: Ian Jackson --- infra/dgit-repos-server | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'infra/dgit-repos-server') diff --git a/infra/dgit-repos-server b/infra/dgit-repos-server index 177829e..f75d7e5 100755 --- a/infra/dgit-repos-server +++ b/infra/dgit-repos-server @@ -591,7 +591,8 @@ sub parsetag_general ($$) { if ($dgititemfn->()) { } elsif (s/^distro\=(\S+) //) { $distrofn->($1); - } elsif (s/^[-+.=0-9a-z]\S* //) { + } elsif (s/^([-+.=0-9a-z]\S*) //) { + printdebug " parsetag ignoring unrecognised \`$1'\n"; } else { die "unknown dgit info in tag ($_)"; } -- cgit v1.2.3 From 4142f6fcd65c1f19e131756e8f5a5ef8f8f5bfa2 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Wed, 17 Jul 2019 02:47:22 +0100 Subject: tag2upload: Actually recognise and honour --quilt in tag Non-default quilt modes were completely broken before. We only didn't notice because the existing tests worked with the default. Signed-off-by: Ian Jackson --- infra/dgit-repos-server | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'infra/dgit-repos-server') diff --git a/infra/dgit-repos-server b/infra/dgit-repos-server index f75d7e5..ba71700 100755 --- a/infra/dgit-repos-server +++ b/infra/dgit-repos-server @@ -1214,7 +1214,7 @@ END $upstreamc = $1; } elsif (s/^upstream-tag=(\S+) //) { $upstreamt = $1; - } elsif (s/^quilt=([-+0-9a-z]+) //) { + } elsif (s/^--quilt=([-+0-9a-z]+) //) { $quilt = $1; } else { return 0; -- cgit v1.2.3 From 9765d5b8002c33130ada5e85b43b88b993b9cff6 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Wed, 17 Jul 2019 03:22:50 +0100 Subject: tag2upload: baredebian: Pass dgit refs/tags/, not the commit hash This will enable git to report the upstream tag in its messages. The tag name is safe to pass here since dgit only uses its referent, unless it is nice enough to print. Signed-off-by: Ian Jackson --- infra/dgit-repos-server | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'infra/dgit-repos-server') diff --git a/infra/dgit-repos-server b/infra/dgit-repos-server index ba71700..09a0d3c 100755 --- a/infra/dgit-repos-server +++ b/infra/dgit-repos-server @@ -1285,7 +1285,7 @@ END if ($quilt =~ m/baredebian/) { die "needed upstream commmitish with --quilt=baredebian" unless defined $upstreamc; - push @dgitcmd, "--upstream-commitish=$upstreamc"; + push @dgitcmd, "--upstream-commitish=refs/tags/$upstreamt"; } } push @dgitcmd, qw(push-source --new --overwrite), $suite; -- cgit v1.2.3 From 5805ac6d5c891d90c6a5edc2fb10b5269e41203f Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 20 Jul 2019 01:26:11 +0100 Subject: Update copyright notices in many files Mostly, adding 2019. Also adding some missing credits to Sean Signed-off-by: Ian Jackson --- infra/dgit-repos-server | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'infra/dgit-repos-server') diff --git a/infra/dgit-repos-server b/infra/dgit-repos-server index 09a0d3c..4c7e031 100755 --- a/infra/dgit-repos-server +++ b/infra/dgit-repos-server @@ -3,7 +3,7 @@ # # git protocol proxy to check dgit pushes etc. # -# Copyright (C) 2014-2016 Ian Jackson +# Copyright (C) 2014-2017,2019 Ian Jackson # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -- cgit v1.2.3