mbox series

[Unstable/Noble,0/2] Fix annotation mismatch when bash is used (plan-A: keep arch-has-odm-enabled.sh)

Message ID 20240301082553.1138917-1-masahiro.yamada@canonical.com
Headers show
Series Fix annotation mismatch when bash is used (plan-A: keep arch-has-odm-enabled.sh) | expand

Message

Masahiro Yamada March 1, 2024, 8:25 a.m. UTC 
If /bin/sh is a symlink to /bin/bash, the annotation check fails
because debian/scripts/misc/arch-has-odm-enabled.sh always fails.

I am not sure if debian/scripts/misc/arch-has-odm-enabled.sh is
necessary in the first place, but if so, we can fix it.

This patch set fixes the issues in that shell script.



Masahiro Yamada (2):
  UBUNTU: [packaging] do not use 'return' outside functions of shell
    script
  UBUNTU: [packaging] do not parse removed debian.*/rules.d/hooks.mk

 debian/scripts/misc/arch-has-odm-enabled.sh | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

Comments

Masahiro Yamada March 9, 2024, 3:27 a.m. UTC | #1 
On Fri, Mar 1, 2024 at 5:25 PM Masahiro Yamada
<masahiro.yamada@canonical.com> wrote:
>
>
> If /bin/sh is a symlink to /bin/bash, the annotation check fails
> because debian/scripts/misc/arch-has-odm-enabled.sh always fails.
>
> I am not sure if debian/scripts/misc/arch-has-odm-enabled.sh is
> necessary in the first place, but if so, we can fix it.
>
> This patch set fixes the issues in that shell script.



Ping?


There are two ways for fixing the bug.
(Plan A or Plan B)





>
>
> Masahiro Yamada (2):
>   UBUNTU: [packaging] do not use 'return' outside functions of shell
>     script
>   UBUNTU: [packaging] do not parse removed debian.*/rules.d/hooks.mk
>
>  debian/scripts/misc/arch-has-odm-enabled.sh | 9 ++-------
>  1 file changed, 2 insertions(+), 7 deletions(-)
>
> --
> 2.40.1
>
Andrea Righi March 9, 2024, 6:41 a.m. UTC | #2 
On Fri, Mar 01, 2024 at 05:25:51PM +0900, Masahiro Yamada wrote:
> 
> If /bin/sh is a symlink to /bin/bash, the annotation check fails
> because debian/scripts/misc/arch-has-odm-enabled.sh always fails.
> 
> I am not sure if debian/scripts/misc/arch-has-odm-enabled.sh is
> necessary in the first place, but if so, we can fix it.
> 
> This patch set fixes the issues in that shell script.

Applied the alternative solution:

 [Unstable/Noble PATCH 0/1] Fix annotation mismatch when bash is used (plan-B: remove arch-has-odm-enabled.sh)

-Andrea