[Rt-commit] rt branch, 4.2/dump-metadata, created. rt-4.2.9-58-g836020d

Alex Vandiver alexmv at bestpractical.com
Tue Dec 30 13:41:57 EST 2014


The branch, 4.2/dump-metadata has been created
        at  836020d1fcd0b188412558ad5673da7a3c2cf6f2 (commit)

- Log -----------------------------------------------------------------
commit af7813350191d679481b1e8b88d85077f91844f4
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Tue Dec 30 13:23:23 2014 -0500

    There is no reason to explicitly load each class; RT::Init handles this

diff --git a/sbin/rt-dump-metadata.in b/sbin/rt-dump-metadata.in
index c7c5a74..cf33200 100644
--- a/sbin/rt-dump-metadata.in
+++ b/sbin/rt-dump-metadata.in
@@ -105,7 +105,6 @@ my @classes      = qw(
     Templates Scrips ACL CustomFields
     );
 foreach my $class (@classes) {
-    require "RT/$class.pm";
     my $objects = "RT::$class"->new( RT->SystemUser );
     $objects->{find_disabled_rows} = 1 unless $opt{'skip-disabled'};
     $objects->UnLimit;

commit 6a7bba1cf1cb6f65c629dae88e2dd0da2aa6d74b
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Tue Dec 30 13:24:00 2014 -0500

    $script->Template now returns a string; don't attempt to load that as an id
    
    Fixes: I#30415

diff --git a/sbin/rt-dump-metadata.in b/sbin/rt-dump-metadata.in
index cf33200..cf286ae 100644
--- a/sbin/rt-dump-metadata.in
+++ b/sbin/rt-dump-metadata.in
@@ -170,6 +170,7 @@ OBJECT:
                 foreach my $key ( map "$record$_", ( '', 'Id' ) ) {
                     next unless exists $rv->{$key};
                     my $id = $rv->{$key} or next;
+                    next unless $id =~ /^\d+$/;
                     my $obj = "RT::$record"->new( RT->SystemUser );
                     $obj->LoadByCols( Id => $id ) or next;
                     $rv->{$key} = $obj->__Value('Name') || 0;

commit 836020d1fcd0b188412558ad5673da7a3c2cf6f2
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Tue Dec 30 13:26:56 2014 -0500

    $group->Type was deprecated in 71fcde32

diff --git a/sbin/rt-dump-metadata.in b/sbin/rt-dump-metadata.in
index cf286ae..ac070ef 100644
--- a/sbin/rt-dump-metadata.in
+++ b/sbin/rt-dump-metadata.in
@@ -233,7 +233,7 @@ OBJECT:
                     # An internal user group
                     if ( /^SystemInternal$/ ) {
                         $rv->{GroupDomain} = $group->Domain;
-                        $rv->{GroupType} = $group->Type;
+                        $rv->{GroupType}   = $group->Name;
                     }
                     # An individual user
                     elsif ( /^ACLEquivalence$/ ) {

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


More information about the rt-commit mailing list