[kteam-tools 1/1] [verify-release-ready] Fix the tag check for derivatives

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
4 messages Options
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

[kteam-tools 1/1] [verify-release-ready] Fix the tag check for derivatives

Juerg Haefliger
Derivatives have a different tag format than what the tool reads from
debian/gbp.conf. Specifically, it's Ubuntu-<derivative>-<version> and
not just Ubuntu-<version>. So adjust the format accordingly.

Signed-off-by: Juerg Haefliger <[hidden email]>
---
 maintscripts/verify-release-ready | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/maintscripts/verify-release-ready b/maintscripts/verify-release-ready
index b22c5aa48639..cfe52d072eeb 100755
--- a/maintscripts/verify-release-ready
+++ b/maintscripts/verify-release-ready
@@ -36,7 +36,7 @@ class VerifyReleaseReady():
         s.defaults['verbose'] = False
         s.passed = 0
         s.failed = 0
-        s.delimiter = 40
+        s.delimiter = 50
         # add launchpadlib support
         s.lp = Launchpad.login_anonymously(s.__class__.__name__, 'production')
         s.lp_ubuntu = s.lp.distributions['ubuntu']
@@ -199,6 +199,14 @@ class VerifyReleaseReady():
         config = ConfigParser.RawConfigParser()
         if config.read('debian/gbp.conf'):
             expect_tag_format = config.get('buildpackage', 'debian-tag')
+
+            # juergh: Derivatives have a different tag format, e.g., Ubuntu-raspi2-<version>
+            pkg = cl1['package']
+            if pkg.startswith('linux-') and not pkg.startswith('linux-lts-'):
+                deriv = pkg[6:]   # strip 'linux-'
+                expect_tag_format = expect_tag_format.replace('%(version)',
+                                                              deriv + '-%(version)')
+
             v = version
             # Starting with trusty, the lts backports closing commit and the tag
             # contain '~<series_version>' (e.g. '~14.04.1')
--
2.11.0


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

ACK/cmnt: [kteam-tools 1/1] [verify-release-ready] Fix the tag check for derivatives

brad.figg
On Fri, Jun 30, 2017 at 05:12:01PM +0200, Juerg Haefliger wrote:

> Derivatives have a different tag format than what the tool reads from
> debian/gbp.conf. Specifically, it's Ubuntu-<derivative>-<version> and
> not just Ubuntu-<version>. So adjust the format accordingly.
>
> Signed-off-by: Juerg Haefliger <[hidden email]>
> ---
>  maintscripts/verify-release-ready | 10 +++++++++-
>  1 file changed, 9 insertions(+), 1 deletion(-)
>
> diff --git a/maintscripts/verify-release-ready b/maintscripts/verify-release-ready
> index b22c5aa48639..cfe52d072eeb 100755
> --- a/maintscripts/verify-release-ready
> +++ b/maintscripts/verify-release-ready
> @@ -36,7 +36,7 @@ class VerifyReleaseReady():
>          s.defaults['verbose'] = False
>          s.passed = 0
>          s.failed = 0
> -        s.delimiter = 40
> +        s.delimiter = 50
>          # add launchpadlib support
>          s.lp = Launchpad.login_anonymously(s.__class__.__name__, 'production')
>          s.lp_ubuntu = s.lp.distributions['ubuntu']
> @@ -199,6 +199,14 @@ class VerifyReleaseReady():
>          config = ConfigParser.RawConfigParser()
>          if config.read('debian/gbp.conf'):
>              expect_tag_format = config.get('buildpackage', 'debian-tag')
> +
> +            # juergh: Derivatives have a different tag format, e.g., Ubuntu-raspi2-<version>
> +            pkg = cl1['package']
> +            if pkg.startswith('linux-') and not pkg.startswith('linux-lts-'):
> +                deriv = pkg[6:]   # strip 'linux-'
> +                expect_tag_format = expect_tag_format.replace('%(version)',
> +                                                              deriv + '-%(version)')

My biggest pet peeve with DEP8 is the 80 character line limit. The above line is not more readable
or understandable by being formatted to fit in 80 characters.

                   expect_tag_format = expect_tag_format.replace('%(version)', deriv + '-%(version)')

That is more readable. Having spent a little time working with punch cards I fail to understand why
we continue to constrain ourselves. You will see in the code I write I don't.

> +
>              v = version
>              # Starting with trusty, the lts backports closing commit and the tag
>              # contain '~<series_version>' (e.g. '~14.04.1')
> --
> 2.11.0
>
>
> --
> kernel-team mailing list
> [hidden email]
> https://lists.ubuntu.com/mailman/listinfo/kernel-team

--
Brad Figg [hidden email] http://www.canonical.com

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

ACK: [kteam-tools 1/1] [verify-release-ready] Fix the tag check for derivatives

Stefan Bader-2
In reply to this post by Juerg Haefliger
On 30.06.2017 17:12, Juerg Haefliger wrote:
> Derivatives have a different tag format than what the tool reads from
> debian/gbp.conf. Specifically, it's Ubuntu-<derivative>-<version> and
> not just Ubuntu-<version>. So adjust the format accordingly.
>
> Signed-off-by: Juerg Haefliger <[hidden email]>
Acked-by: Stefan Bader <[hidden email]>

> ---
>  maintscripts/verify-release-ready | 10 +++++++++-
>  1 file changed, 9 insertions(+), 1 deletion(-)
>
> diff --git a/maintscripts/verify-release-ready b/maintscripts/verify-release-ready
> index b22c5aa48639..cfe52d072eeb 100755
> --- a/maintscripts/verify-release-ready
> +++ b/maintscripts/verify-release-ready
> @@ -36,7 +36,7 @@ class VerifyReleaseReady():
>          s.defaults['verbose'] = False
>          s.passed = 0
>          s.failed = 0
> -        s.delimiter = 40
> +        s.delimiter = 50
>          # add launchpadlib support
>          s.lp = Launchpad.login_anonymously(s.__class__.__name__, 'production')
>          s.lp_ubuntu = s.lp.distributions['ubuntu']
> @@ -199,6 +199,14 @@ class VerifyReleaseReady():
>          config = ConfigParser.RawConfigParser()
>          if config.read('debian/gbp.conf'):
>              expect_tag_format = config.get('buildpackage', 'debian-tag')
> +
> +            # juergh: Derivatives have a different tag format, e.g., Ubuntu-raspi2-<version>
> +            pkg = cl1['package']
> +            if pkg.startswith('linux-') and not pkg.startswith('linux-lts-'):
> +                deriv = pkg[6:]   # strip 'linux-'
> +                expect_tag_format = expect_tag_format.replace('%(version)',
> +                                                              deriv + '-%(version)')
> +
>              v = version
>              # Starting with trusty, the lts backports closing commit and the tag
>              # contain '~<series_version>' (e.g. '~14.04.1')
>


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team

signature.asc (836 bytes) Download Attachment
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

APPLIED: [kteam-tools 1/1] [verify-release-ready] Fix the tag check for derivatives

Kleber Souza
In reply to this post by Juerg Haefliger
Applied on kteam-tools master branch.

Thanks.

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Loading...