375287 - Remove the version check in contrib/merge-users.pl

Status: RESOLVED FIXED

(Bugzilla :: Administration, task)

Description

[Corris]

User-Agent:       Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.2) Gecko/20061201 Firefox/2.0.0.2 (Ubuntu-feisty)
Build Identifier: 3.0-RC1

The contrib/merge-users.pl script doesn't understand about bugzilla 3.x.


Reproducible: Always

Steps to Reproduce:
1. run ./contrib/merge-users.pl

Actual Results:  
You are using Bugzilla 3.0rc1 but Bugzilla 2.20 - 2.23 is required.

Expected Results:  
it should have run.

--- merge-users.pl      Sun Mar 25 07:41:37 2007
+++ merge-users.pl_3.x  Sun Mar 25 07:40:35 2007
@@ -63,7 +63,7 @@
 
 # We require Bugzilla 2.20 or higher (including 2.22+).
 my $current_version = BUGZILLA_VERSION;
-if ($current_version =~ /^2\.2[0123]/) {
+if ($current_version =~ /^(2\.2[0123])|3\.\d+/) {
     print "OK, you are using Bugzilla $current_version\n"
 }
 else {

Comment 1

[Corris]

Attachment: patch

Comment 2

[Frédéric Buclin]

You know what? Remove this check completely. I added it in bug 188264 to make sure the script is really up-to-date for the given Bugzilla version, but you just demonstrated why it was not a good idea. And writing 3\.\d+ means "accept everything", so we can as well drop this check.

Comment 3

[Corris]

haha, yea, I just wanted it to run.  seemed to work fine.  maybe the regex shouldn't be a regex, and just see if the value is > 2.2:  

if ( $current_version > 2.2 ) {

Comment 4

[Frédéric Buclin]

No need. Remove this check, attach a patch and I will review it. :)

Comment 5

[Corris]

Attachment: remove check for bugzilla version

Comment 6

[Frédéric Buclin]

Comment on attachment 259892 [details] [diff] [review]
remove check for bugzilla version

Thanks for the patch. r=LpSolit

Comment 7

[Frédéric Buclin]

tip:

Checking in contrib/merge-users.pl;
/cvsroot/mozilla/webtools/bugzilla/contrib/merge-users.pl,v  <--  merge-users.pl
new revision: 1.4; previous revision: 1.3
done

3.0 RC1:

Checking in contrib/merge-users.pl;
/cvsroot/mozilla/webtools/bugzilla/contrib/merge-users.pl,v  <--  merge-users.pl
new revision: 1.3.2.1; previous revision: 1.3
done