[Bps-public-commit] rt1-to-rt3 branch, master, updated. 57d3c80f5ffc7702c448d1c7fa70bf89f9930469

[jesse]

The branch, master has been updated
       via  57d3c80f5ffc7702c448d1c7fa70bf89f9930469 (commit)
       via  1534fdd7185e56258bb957ffbbddeb4645a52497 (commit)
       via  4cf4367eaa13baa3bbfd4733e78fd2721a137ab7 (commit)
       via  3051e63eaa5b20d8a944bf7180b2b9f72a73e2a3 (commit)
      from  097af7a38b447cbb524fbc154f06af66d1ba646d (commit)

Summary of changes:
 bin/rt1-to-rt3                    |    6 +++---
 lib/RT/Extension/Converter/RT3.pm |   13 +++++++++----
 2 files changed, 12 insertions(+), 7 deletions(-)

- Log -----------------------------------------------------------------
commit 3051e63eaa5b20d8a944bf7180b2b9f72a73e2a3
Author: Jesse Vincent <jesse at bestpractical.com>
Date:   Tue Dec 8 16:26:31 2009 -0500

    Update the RT3 side of the converter for the correct right-name for managing a queue's custom fields in 3.8

diff --git a/lib/RT/Extension/Converter/RT3.pm b/lib/RT/Extension/Converter/RT3.pm
index 1be5533..2e315c6 100644
--- a/lib/RT/Extension/Converter/RT3.pm
+++ b/lib/RT/Extension/Converter/RT3.pm
@@ -235,7 +235,7 @@ sub create_queue_acl {
                          ShowTicket ShowTicketComments)],
        manipulate => [qw(CreateTicket ReplyToTicket CommentOnTicket 
                          OwnTicket ModifyTicket DeleteTicket)],
-       admin      => [qw(ModifyACL ModifyQueueWatchers AdminCustomField
+       admin      => [qw(ModifyACL ModifyQueueWatchers AssignCustomFields
                          ModifyTemplate ModifyScrips)] 
     );
 

commit 4cf4367eaa13baa3bbfd4733e78fd2721a137ab7
Author: Jesse Vincent <jesse at bestpractical.com>
Date:   Tue Dec 8 16:27:21 2009 -0500

    Debug message updating

diff --git a/lib/RT/Extension/Converter/RT3.pm b/lib/RT/Extension/Converter/RT3.pm
index 2e315c6..7ac37cf 100644
--- a/lib/RT/Extension/Converter/RT3.pm
+++ b/lib/RT/Extension/Converter/RT3.pm
@@ -573,14 +573,14 @@ sub _find_transaction_file {
         $file .= $args{Filename};
         $file =~ s/ //;
 
-        print "\nTesting $file" if $self->config->debug;
+        #print "\nTesting $file" if $self->config->debug;
         if (-e $file) {
             return $file
         } else {
             push @files,$file;
         }
     }
-    warn "none of @files exist\n";
+    warn "ERROR: Missing transaction - none of ".join(",", at files)." exist\n";
     return;
 }
 

commit 1534fdd7185e56258bb957ffbbddeb4645a52497
Author: Jesse Vincent <jesse at bestpractical.com>
Date:   Tue Dec 8 16:27:37 2009 -0500

    Further bulletproofing for trying to create ticket watchers on the fly when you have bad data

diff --git a/lib/RT/Extension/Converter/RT3.pm b/lib/RT/Extension/Converter/RT3.pm
index 7ac37cf..c58c5ba 100644
--- a/lib/RT/Extension/Converter/RT3.pm
+++ b/lib/RT/Extension/Converter/RT3.pm
@@ -695,6 +695,10 @@ sub _load_or_create_user {
         $user_obj->LoadByEmail($args{EmailAddress});
     }
     unless ($user_obj->Id) {
+        $user_obj->Load($args{EmailAddress});
+
+    }
+    unless ($user_obj->Id) {
         my ($val, $msg) = $user_obj->Create(%args,
                                             Password => undef,
                                             Privileged => 0,
@@ -702,7 +706,8 @@ sub _load_or_create_user {
         );
 
         unless ($val) {
-            die "couldn't create user_obj for %args{Name}: $msg\n";
+            warn "couldn't create user_obj for ".$args{Name}.": $msg\n";
+	    return RT->Nobody();
         }
     }
 

commit 57d3c80f5ffc7702c448d1c7fa70bf89f9930469
Author: Jesse Vincent <jesse at bestpractical.com>
Date:   Tue Dec 8 16:28:31 2009 -0500

    Updating the names of the tool in rt1-to-rt3

diff --git a/bin/rt1-to-rt3 b/bin/rt1-to-rt3
index d33640f..6ba2927 100644
--- a/bin/rt1-to-rt3
+++ b/bin/rt1-to-rt3
@@ -13,10 +13,10 @@ use RT;
     RT::LoadConfig();
     RT::Init();
 
-use RTx::Converter;
+use RT::Extension::Converter;
 
-my $rt1 = RTx::Converter->new( type => 'RT1' );
-my $rt3 = RTx::Converter->new( type => 'RT3' );
+my $rt1 = RT::Extension::Converter->new( type => 'RT1' );
+my $rt3 = RT::Extension::Converter->new( type => 'RT3' );
 
 # should probably read a config file here
 # perldoc RTx::Converter::RT1::Config RTx::Converter::RT3::Config for options

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