[Bps-public-commit] cpan2rt branch, deploy, updated. 58e0088a0e20e2ef6dd1343c4444213901c67f1c

[Thomas Sibley]

The branch, deploy has been updated
       via  58e0088a0e20e2ef6dd1343c4444213901c67f1c (commit)
      from  27e9eb74e3c2af6f44bb0ee796378cc85f02f010 (commit)

Summary of changes:
 lib/CPAN2RT.pm | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

- Log -----------------------------------------------------------------
commit 58e0088a0e20e2ef6dd1343c4444213901c67f1c
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Wed May 1 19:30:13 2013 -0700

    Ensure the user we merge the just-created CPANID shell user into is Privileged
    
    Otherwise they log in as a PAUSE author but only have the permissions of
    an OpenID user.

diff --git a/lib/CPAN2RT.pm b/lib/CPAN2RT.pm
index e941409..1bc2905 100644
--- a/lib/CPAN2RT.pm
+++ b/lib/CPAN2RT.pm
@@ -807,7 +807,12 @@ sub load_or_create_user {
 
         if ( $new->can('MergeInto') ) {
             debug { "Merging user @{[$new->Name]} into @{[$byemail->Name]}...\n" };
-            $new->MergeInto( $byemail );
+            my ($ok, $msg) = $new->MergeInto( $byemail );
+            if ($ok) {
+                $byemail->SetPrivileged(1);
+            } else {
+                debug { "Couldn't merge user @{[$new->id]} into @{[$byemail->id]}: $msg" };
+            }
         } else {
             debug {
                 "WARNING: Couldn't merge user @{[$new->Name]} into @{[$byemail->Name]}."

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