Skip to content

Conversation

@aciba90
Copy link
Contributor

@aciba90 aciba90 commented Jul 5, 2022

do not squash

SC-1154

Copy link
Collaborator

@blackboxsw blackboxsw left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Minor pending discussion on #1563 which applies here.

@aciba90
Copy link
Contributor Author

aciba90 commented Jul 6, 2022

Minor pending discussion on #1563 which applies here.

Fixed, ready to be reviewed.

@aciba90 aciba90 requested a review from blackboxsw July 6, 2022 14:03

# Don't do anything unless we have grub
[ -x /usr/sbin/grub-install ] || return 0
command -v grub-install > /dev/null 2>&1 || return 0
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: no need to redirect stderr.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like you're still redirecting stderr (2>&1)? Anyway this is really a nitty nit, up to you what to do here!

@@ -0,0 +1,2 @@
# Conflict due to Ubuntu version conventions
cloud-init source: binary-nmu-debian-revision-in-source
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks like a bug in Lintian. Lintian shouldn't issue that warning on Ubuntu packages, see the && !$ubuntu here:

https://salsa.debian.org/lintian/lintian/-/blob/ecc04980869462c5c71f4f71e9b8a71bd5b944b5/lib/Lintian/Check/Fields/Version.pm#L87

I think the issue is with this regexp:

https://salsa.debian.org/lintian/lintian/-/blob/ecc04980869462c5c71f4f71e9b8a71bd5b944b5/lib/Lintian/Check/Fields/Version.pm#L65

but I didn't dig too deep. Ideally we should file a bug against lintian and refer to bug number in the explanatory comment.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reported and referenced.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've commented on the lintian bug as well. I think we can discuss as a team whether to change or diminished version ~18.04.1 vs. augmented version strategy .18.04.1 even though I feel like this is a lintian versioning bug. Since we are now appending the Ubuntu development version suffix for all releases in kinetic, changing to the augmented .22.04.1 suffix for jammy would still preserve a package version upgrade path to kinetic's comparable suffix .22.10.1.

@aciba90 aciba90 marked this pull request as draft July 7, 2022 13:37
@aciba90
Copy link
Contributor Author

aciba90 commented Jul 7, 2022

Copy link
Contributor Author

@aciba90 aciba90 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, @paride, for pointing the lintian bug out. I have filled a bug report and referenced it in the changelog.


# Don't do anything unless we have grub
[ -x /usr/sbin/grub-install ] || return 0
command -v grub-install > /dev/null 2>&1 || return 0
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

@@ -0,0 +1,2 @@
# Conflict due to Ubuntu version conventions
cloud-init source: binary-nmu-debian-revision-in-source
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reported and referenced.

@aciba90 aciba90 marked this pull request as ready for review July 8, 2022 10:25
@aciba90 aciba90 requested a review from paride July 8, 2022 10:25
Copy link
Contributor

@paride paride left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks!


# Don't do anything unless we have grub
[ -x /usr/sbin/grub-install ] || return 0
command -v grub-install > /dev/null 2>&1 || return 0
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like you're still redirecting stderr (2>&1)? Anyway this is really a nitty nit, up to you what to do here!

Copy link
Collaborator

@blackboxsw blackboxsw left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • build-package, sbuild success lintian warnings reduced
  • d/changelog package version good, changelog entries good
  • separate commits for debian/* changes good
  • +1 on travis CI to focal
  • will discuss versioning suffix changes ~18.04.1 -> .18.04.1 separately.

@blackboxsw blackboxsw merged commit 8b67b67 into canonical:ubuntu/bionic Jul 13, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants