[Rt-commit] rtir branch, 2.6-trunk, updated. 2.6.2rc1-11-ga640528

[Ruslan Zakirov]

The branch, 2.6-trunk has been updated
       via  a6405284277e87ea2c772bb857d3cd53b03b0b85 (commit)
       via  25dbac6033cba2c3878be80ed1001691d9c917cc (commit)
      from  aa31196e4623abb8a3c1defb224f78bbb0183917 (commit)

Summary of changes:
 etc/upgrade/2.5.1/content | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

- Log -----------------------------------------------------------------
commit 25dbac6033cba2c3878be80ed1001691d9c917cc
Author: Jim Brandt <jbrandt at bestpractical.com>
Date:   Tue Oct 2 14:47:04 2012 -0400

    Update debug message in content to warn on success
    
    The previous debug message in the content file for the 2.5.1
    upgrade issued an error even when the targeted custom field
    was successfully updated. This was a confusing message since it
    said both "error" and "success."
    
    Update to warn on success so users still see that key custom
    fields are changed. Still error on failure.

diff --git a/etc/upgrade/2.5.1/content b/etc/upgrade/2.5.1/content
index be1ccc4..ee8265e 100644
--- a/etc/upgrade/2.5.1/content
+++ b/etc/upgrade/2.5.1/content
@@ -18,7 +18,13 @@ my %special_rename = (
             $new = $special_rename{ lc $new } || $new;
 
             my ($status, $msg) = $cf->SetName( $new );
-            $RT::Logger->error("Couldn't rename custom field '$name': $msg");
+
+            if ( $status ){
+                $RT::Logger->warning("RTIR custom field $name renamed: $msg");
+            }
+            else{
+                $RT::Logger->error("Couldn't rename custom field '$name': $msg");
+            }
         }
     },
 );

commit a6405284277e87ea2c772bb857d3cd53b03b0b85
Merge: aa31196 25dbac6
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date:   Thu Nov 15 21:12:37 2012 +0400

    Merge branch '2.9/error-message-on-251-upgrade' into 2.6-trunk


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