499730 - Fix handling of beta/intl in update-check

Status: RESOLVED FIXED

(Camino Graveyard :: Product Site, defect)

Description

[Stuart Morgan]

The current script treats all Intl versions as betas; it's harmless since our betas are all non-intl, but it could bite us later. I need to tighten the regex and then do a bunch of testing.

Comment 1

[Stuart Morgan]

Attachment: fix

I've tested this locally and it worked, but it wouldn't hurt to give it a sanity check as the test version of update-check ;)

Comment 2

[Smokey Ardisson (offline for a while; not following bugs - do not email)]

What is the specific test case for comment 0 that we want to prevent?  1.6.7Int checks for updates and receives an update to a hypothetical 2.0b3Int instead of 1.6.8Int?

Comment 3

[Stuart Morgan]

Comment on attachment 388167 [details] [diff] [review]
fix

Yes (where the hypothetical 2.0b3Int doesn't have a min version, as our current series of 2.0 betas do).

Except I'm an idiot. It's Int, not Intl, so this doesn't work. I'll do a new patch tomorrow morning.

Comment 4

[Stuart Morgan]

Attachment: v2

This will handle both Int and Intl, just in case anyone making the builds makes the same mistake ;)

Comment 5

[Smokey Ardisson (offline for a while; not following bugs - do not email)]

Comment on attachment 388215 [details] [diff] [review]
v2

This seems to work OK for me as update-check-test, including testing against a fake 2.0b3Int with no min version set.  Of course, the last version seemed to work OK, too, so who knows what I'm not testing :P

>+# Returns true if the given version is a release version (i.e., not an alpha,
>+# beta, or nightly).
>+sub version_is_release {
>+  my ($version) = @_;
>+  $version =~ s/\s*intl?$//i;
>+  return $version !~ /(?:(?:a|b)\d*|pre)$/;
>+}

r=ardissone with a comment there about why we're checking for {int|intl}, so we don't perpetuate any confusion.

Comment 6

[Stuart Morgan]

Landed on CVS trunk with added comment.

Comment 7

[Smokey Ardisson (offline for a while; not following bugs - do not email)]

Pushed live.