[Bps-public-commit] cpan2rt branch, master, updated. cdb51099d249207e1d6312ad6b564163efe9447e

[Dianne Skoll]

The branch, master has been updated
       via  cdb51099d249207e1d6312ad6b564163efe9447e (commit)
       via  877236d289d33ae1d7afa1d092fcd8d7c4aa9509 (commit)
      from  27308caee0e167dba5b254c324a1a39466d8cd6b (commit)

Summary of changes:
 bin/cpan2rt    |  4 ++--
 lib/CPAN2RT.pm | 16 +++++++++-------
 2 files changed, 11 insertions(+), 9 deletions(-)

- Log -----------------------------------------------------------------
commit 877236d289d33ae1d7afa1d092fcd8d7c4aa9509
Author: Dianne Skoll <dianne at bestpractical.com>
Date:   Wed Feb 24 15:38:55 2021 -0500

    Fix path to Perl interpreter for Hosted RT installation

diff --git a/bin/cpan2rt b/bin/cpan2rt
index 7bf9e14..8cb64f1 100755
--- a/bin/cpan2rt
+++ b/bin/cpan2rt
@@ -1,6 +1,6 @@
-#!/home/rtcpan/perlbrew/perls/perl-5.16.3/bin/perl
+#!/opt/perl/bin/perl
 
-eval 'exec /home/rtcpan/perlbrew/perls/perl-5.16.3/bin/perl  -S $0 ${1+"$@"}'
+eval 'exec /opt/perl/bin/perl  -S $0 ${1+"$@"}'
     if 0; # not running under some shell
 
 =head1 NAME

commit cdb51099d249207e1d6312ad6b564163efe9447e
Author: Dianne Skoll <dianne at bestpractical.com>
Date:   Wed Feb 24 15:39:11 2021 -0500

    Fix code that created bad SQL; fix code that died with a "Wide character" error

diff --git a/lib/CPAN2RT.pm b/lib/CPAN2RT.pm
index 18d858f..3cdd4c1 100644
--- a/lib/CPAN2RT.pm
+++ b/lib/CPAN2RT.pm
@@ -467,12 +467,14 @@ sub _sync_bugtracker_rt2cpan {
 
     # Find queues with a DistributionBugtracker attribute
     my $queues = RT::Queues->new( $RT::SystemUser );
-    $queues->Limit(
-        FIELD       => 'id',
-        OPERATOR    => 'NOT IN',
-        VALUE       => $has_bugtracker,
-    );
-
+    if (scalar(@$has_bugtracker)) {
+	$queues->Limit(
+	    FIELD       => 'id',
+	    OPERATOR    => 'NOT IN',
+	    VALUE       => $has_bugtracker,
+        );
+    }
+    
     my $attributes = $queues->Join(
         ALIAS1 => 'main',
         FIELD1 => 'id',
@@ -1061,7 +1063,7 @@ sub end_element {
 
     if ( $name eq 'cpanid' ) {
         $self->{inside} = 0;
-        my %rec = map Encode::decode_utf8($_), @{ delete $self->{'tmp'} };
+        my %rec = @{ delete $self->{'tmp'} };
         $self->{'res'}{ delete $rec{'id'} } = \%rec;
     }
 }

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