Merge lp://staging/~roadmr/checkbox/814085 into lp://staging/checkbox

Proposed by Daniel Manrique
Status: Merged
Merged at revision: 992
Proposed branch: lp://staging/~roadmr/checkbox/814085
Merge into: lp://staging/checkbox
Diff against target: 55 lines (+16/-1) (has conflicts)
2 files modified
debian/changelog (+14/-0)
scripts/cdimage_resource (+2/-1)
Text conflict in debian/changelog
To merge this branch: bzr merge lp://staging/~roadmr/checkbox/814085
Reviewer Review Type Date Requested Status
Marc Tardif (community) Approve
Daniel Manrique (community) Needs Resubmitting
Review via email: mp+68720@code.staging.launchpad.net

Description of the change

A small tweak to the regex used to extract the release number in scripts/cdimage_resource, because I noticed that for instance Lucid is named "10.04.2 LTS" and the LTS part was throwing off the old regex.

This will be nice to have for future LTS releases if the naming convention sticks, but for Lucid it's probably not SRU-worthy as base checkbox doesn't report cdimage_resource data when submitting to launchpad. We'd have to see whether this affects our Lucid kernel SRU testing and whether this change is worth backporting to the version of checkbox used for those tests (it should integrate easily).

To post a comment you must log in.
Revision history for this message
Marc Tardif (cr3) wrote :

Shouldn't the regex be "( LTS)?" rather than "( LTS)*"?

review: Needs Information
lp://staging/~roadmr/checkbox/814085 updated
969. By Daniel Manrique

Improved regex per cr3's suggestion

Revision history for this message
Daniel Manrique (roadmr) wrote :

> Shouldn't the regex be "( LTS)?" rather than "( LTS)*"?

Ah, yes, you're right. My approach was a bit more shotgun :)

I've fixed the regexp and updated the branch.

review: Needs Resubmitting
Revision history for this message
Marc Tardif (cr3) wrote :

Looks good, merging.

review: Approve
Revision history for this message
Marc Tardif (cr3) wrote :

By the way, you committed merge conflict code. I'll take care of that...

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches