[Merge] ~hopem/ubuntu/+source/python-ovsdbapp:stable/yoga into ~ubuntu-openstack-dev/ubuntu/+source/python-ovsdbapp:stable/yoga

[James Page]

Review: Needs Fixing

Two inline comments and two general ones

1) please don't commit with patches applied - always quilt pop -a first!

2) Fix-TRY_AGAIN-handling.patch is actually missing from the branch proposed.

Diff comments:

> diff --git a/debian/changelog b/debian/changelog
> index b79f745..d5eef20 100644
> --- a/debian/changelog
> +++ b/debian/changelog
> @@ -1,8 +1,13 @@
> -python-ovsdbapp (1.15.1-0ubuntu2.1) UNRELEASED; urgency=medium
> +python-ovsdbapp (1.15.1-0ubuntu2.2) UNRELEASED; urgency=medium

not need to increment the version number - 2.1 is unused.

>  
> +  [ Corey Bryant ]
>    * d/gbp.conf: Create stable/yoga branch.
>  
> - -- Corey Bryant <corey.bryant at canonical.com>  Mon, 25 Apr 2022 10:07:27 -0400
> +  [ Edward Hope-Morley ]
> +  * fix transaction try handling (LP: #1988457)
> +  * d/p/Fix-TRY_AGAIN-handling.patch

I'd like to see a summary line followed by the detail so something like:

* Fix transaction retry handling (LP: #1988457):
  - d/p/Fix-TRY_AGAIN-handling.patch: Cherry pick fix from upstream stable
    branch for OpenStack Yoga.

> +
> + -- Edward Hope-Morley <edward.hope-morley at canonical.com>  Fri, 09 Aug 2024 10:02:26 +0100
>  
>  python-ovsdbapp (1.15.1-0ubuntu2) jammy; urgency=medium
>  
> diff --git a/debian/patches/series b/debian/patches/series
> index c1d6c09..b700fbc 100644
> --- a/debian/patches/series
> +++ b/debian/patches/series
> @@ -1 +1,2 @@
> +Fix-TRY_AGAIN-handling.patch
>  fix-broken-behavior-after-recent-OVS-update.patch

Please add new patches to the bottom of the series file.



-- 
https://code.launchpad.net/~hopem/ubuntu/+source/python-ovsdbapp/+git/python-ovsdbapp/+merge/470975
Your team Ubuntu OpenStack uploaders is subscribed to branch ~ubuntu-openstack-dev/ubuntu/+source/python-ovsdbapp:stable/yoga.