<div dir="ltr"><div dir="ltr"><br></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Thu, Feb 14, 2019 at 10:46 AM Christophe Fergeau <<a href="mailto:cfergeau@redhat.com">cfergeau@redhat.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">On Wed, Feb 13, 2019 at 08:19:24PM +0100, Fabiano Fidêncio wrote:<br>
> The first release of Ubuntu ISOs usually have their volume-id as, for<br>
> instance:<br>
> Ubuntu-Server 18.04 LTS amd64<br>
> <br>
> Whenever a new release is done, a new digit is added as, for instance:<br>
> Ubuntu-Server 18.04.1 LTS amd64<br>
> <br>
> However, at least with 18.04, they had a new release for the server<br>
> media that looks like:<br>
> Ubuntu-Server 18.04.1+ LTS amd64<br>
> <br>
> This '+' addition breaks the current used regular expression to match<br>
> the media's volume-id. In order to take a safer path, let's expand all<br>
> the regular expressions that have '(.\d)?' to use '(.\d\+?)?' instead,<br>
> being able then to also match the '+'.<br>
> <br>
> The command used to change all the entries is:<br>
> sed -i -e 's/(.\\d)?/(.\\d\\+?)?/g' ubuntu-*.<a href="http://xml.in" rel="noreferrer" target="_blank">xml.in</a><br>
> <br>
> Signed-off-by: Fabiano Fidêncio <<a href="mailto:fidencio@redhat.com" target="_blank">fidencio@redhat.com</a>><br>
> ---<br>
> data/os/<a href="http://ubuntu.com/ubuntu-10.04.xml.in" rel="noreferrer" target="_blank">ubuntu.com/ubuntu-10.04.xml.in</a> | 4 ++--<br>
> data/os/<a href="http://ubuntu.com/ubuntu-12.04.xml.in" rel="noreferrer" target="_blank">ubuntu.com/ubuntu-12.04.xml.in</a> | 8 ++++----<br>
> data/os/<a href="http://ubuntu.com/ubuntu-14.04.xml.in" rel="noreferrer" target="_blank">ubuntu.com/ubuntu-14.04.xml.in</a> | 8 ++++----<br>
> data/os/<a href="http://ubuntu.com/ubuntu-14.10.xml.in" rel="noreferrer" target="_blank">ubuntu.com/ubuntu-14.10.xml.in</a> | 8 ++++----<br>
> data/os/<a href="http://ubuntu.com/ubuntu-15.04.xml.in" rel="noreferrer" target="_blank">ubuntu.com/ubuntu-15.04.xml.in</a> | 8 ++++----<br>
> data/os/<a href="http://ubuntu.com/ubuntu-15.10.xml.in" rel="noreferrer" target="_blank">ubuntu.com/ubuntu-15.10.xml.in</a> | 8 ++++----<br>
> data/os/<a href="http://ubuntu.com/ubuntu-16.04.xml.in" rel="noreferrer" target="_blank">ubuntu.com/ubuntu-16.04.xml.in</a> | 14 ++++++-------<br>
> data/os/<a href="http://ubuntu.com/ubuntu-16.10.xml.in" rel="noreferrer" target="_blank">ubuntu.com/ubuntu-16.10.xml.in</a> | 16 +++++++--------<br>
> data/os/<a href="http://ubuntu.com/ubuntu-17.04.xml.in" rel="noreferrer" target="_blank">ubuntu.com/ubuntu-17.04.xml.in</a> | 14 ++++++-------<br>
> data/os/<a href="http://ubuntu.com/ubuntu-17.10.xml.in" rel="noreferrer" target="_blank">ubuntu.com/ubuntu-17.10.xml.in</a> | 12 +++++------<br>
> data/os/<a href="http://ubuntu.com/ubuntu-18.04.xml.in" rel="noreferrer" target="_blank">ubuntu.com/ubuntu-18.04.xml.in</a> | 10 ++++-----<br>
> data/os/<a href="http://ubuntu.com/ubuntu-18.10.xml.in" rel="noreferrer" target="_blank">ubuntu.com/ubuntu-18.10.xml.in</a> | 12 +++++------<br>
> data/os/<a href="http://ubuntu.com/ubuntu-19.04.xml.in" rel="noreferrer" target="_blank">ubuntu.com/ubuntu-19.04.xml.in</a> | 10 ++++-----<br>
> data/os/<a href="http://ubuntu.com/ubuntu-6.06.xml.in" rel="noreferrer" target="_blank">ubuntu.com/ubuntu-6.06.xml.in</a> | 28 +++++++++++++-------------<br>
> data/os/<a href="http://ubuntu.com/ubuntu-8.04.xml.in" rel="noreferrer" target="_blank">ubuntu.com/ubuntu-8.04.xml.in</a> | 12 +++++------<br>
> data/os/<a href="http://ubuntu.com/ubuntu-9.04.xml.in" rel="noreferrer" target="_blank">ubuntu.com/ubuntu-9.04.xml.in</a> | 8 ++++----<br>
<br>
A bunch of the older releases don't look for xx.yy.zz in the volume id,<br>
but only for xx.yy. Your patch is missing these. It's not clear to me if<br>
it's intentional that we don't have these matches for these releases, or<br>
if it's just something that was overlooked.<br></blockquote><div><br></div><div>I guess it's been overlooked for a few years :-)</div><div>I'll do the changes on those files as well to keep them as the others.</div><div><br></div><div>Do you want to see a v2 of this patch?</div><div><br></div><div>[snip]<br></div></div></div>