[Rt-commit] rt branch, 4.2/upgrade-4.1.5, created. rt-4.2.4-55-g046d55f

[Alex Vandiver]

The branch, 4.2/upgrade-4.1.5 has been created
        at  046d55f340efc7586c34b8b0f96012ce1fc96c92 (commit)

- Log -----------------------------------------------------------------
commit 046d55f340efc7586c34b8b0f96012ce1fc96c92
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Wed Jun 18 13:47:10 2014 -0400

    Handle enabled scrips in 4.1.5 upgrade, and disabled scrips in 4.2.2
    
    90ba5667 rightly noticed that the 4.1.5 upgrade step had not adjusted
    the Template column of disabled scrips.  In addition to adding a 4.2.2
    upgrade step to handle them, it additionally changed the 4.1.5 upgrade
    step to process them as well.
    
    For installs which had already upgraded to 4.2.0 or 4.2.1, the change to
    the 4.1.5 upgrade step was immaterial, and the missed scrips were fixed
    by the 4.2.2 upgrade step.  However, it introduced a bug for installs
    which were still on 4.0.x: namely, the 4.1.5 upgrade step would now
    handle all scrips (including disabled scrips), followed the 4.2.2
    upgrade step which would examine the disabled scrips -- and produce
    warnings because they already contained characters.
    
    One possibility is to remove the warning in the 4.2.2 upgrade step for
    characters being found in the Template column; however, this might mask
    problems in users on 4.2.0 or 4.2.1 for whom this is the first
    examination of disabled scrips, and such a case is indeed a potential
    problem.
    
    Instead, opt to revert the 4.1.5 upgrade to only handling non-disabled
    scrips.  The disabled scrips are thus handled identically by the 4.2.2
    upgrade step for upgrades from both 4.0.x and 4.2.0/4.2.1.
    
    This partially reverts commit 90ba56675bc5f288d4483f079f89a3b4c0d4cdc7.

diff --git a/etc/upgrade/4.1.5/content b/etc/upgrade/4.1.5/content
index 4cf1bdb..0ed1dda 100644
--- a/etc/upgrade/4.1.5/content
+++ b/etc/upgrade/4.1.5/content
@@ -6,7 +6,6 @@ our @Initial = (
     sub {
         require RT::Scrips;
         my $scrips = RT::Scrips->new( RT->SystemUser );
-        $scrips->{'find_disabled_rows'} = 1;
         $scrips->UnLimit;
         while ( my $scrip = $scrips->Next ) {
             my $id = $scrip->Template;

-----------------------------------------------------------------------