use templates for pkgreport

[debbugs.git] / Debbugs / User.pm

diff --git a/Debbugs/User.pm b/Debbugs/User.pm
index d7fcbe217b6defe4fc1efdc8c0f1207a5c0d58cc..63b62be23523d7762b100f4dbaf521668bfbfe24 100644 (file)
--- a/Debbugs/User.pm
+++ b/Debbugs/User.pm
@@ -248,7 +248,7 @@ sub write {
         next if @{$ut->{$t}} == 0;
         print {$uf} "Tag: $t\n";
         print {$uf} _wrap_to_length("Bugs: " . join(", ", @{$ut->{$t}}), 77) . "\n";
-        print $uf "\n";
+        print {$uf} "\n";
     }
 
     my $uc = $self->{"categories"};
@@ -256,31 +256,31 @@ sub write {
     for my $c (keys %{$uc}) {
         next if @{$uc->{$c}} == 0;
 
-        print $uf "Category: $c\n";
-       print $uf "Hidden: yes\n" unless defined $vis{$c};
+        print {$uf} "Category: $c\n";
+       print {$uf} "Hidden: yes\n" unless defined $vis{$c};
        my $i = 0;
        for my $cat (@{$uc->{$c}}) {
            $i++;
            if (ref($cat) eq "HASH") {
-               printf $uf "Cat%d: %s\n", $i, $cat->{"nam"};
-               printf $uf "Cat%dOptions:\n", $i;
+               printf {$uf} "Cat%d: %s\n", $i, $cat->{"nam"};
+               printf {$uf} "Cat%dOptions:\n", $i;
                for my $j (0..$#{$cat->{"pri"}}) {
                    if (defined $cat->{"ttl"}->[$j]) {
-                       printf $uf " %s - %s\n",
+                       printf {$uf} " %s - %s\n",
                            $cat->{"pri"}->[$j], $cat->{"ttl"}->[$j];
                    } else {
-                       printf $uf " %s\n", $cat->{"pri"}->[$j];
+                       printf {$uf} " %s\n", $cat->{"pri"}->[$j];
                    }
                }
-               printf $uf "Cat%dDefault: %s\n", $i, $cat->{"def"}
+               printf {$uf} "Cat%dDefault: %s\n", $i, $cat->{"def"}
                    if defined $cat->{"def"};
-               printf $uf "Cat%dOrder: %s\n", $i, join(", ", @{$cat->{"ord"}})
+               printf {$uf} "Cat%dOrder: %s\n", $i, join(", ", @{$cat->{"ord"}})
                    if defined $cat->{"ord"};
            } else {
-               printf $uf "Cat%d: %s\n", $i, $cat;
+               printf {$uf} "Cat%d: %s\n", $i, $cat;
            }
        }
-       print $uf "\n";
+       print {$uf} "\n";
     }
     # handle the value stanzas
     my %value;
@@ -318,7 +318,7 @@ sub write {
 sub read_usertags {
     my ($usertags,$email) = @_;
 
-    carp "read_usertags is deprecated";
+#    carp "read_usertags is deprecated";
     my $user = get_user($email);
     for my $tag (keys %{$user->{"tags"}}) {
         $usertags->{$tag} = [] unless defined $usertags->{$tag};
@@ -339,7 +339,7 @@ them out.
 sub write_usertags {
     my ($usertags,$email) = @_;
 
-    carp "write_usertags is deprecated";
+#    carp "write_usertags is deprecated";
     my $user = Debbugs::User->new($email,1); # locked
     $user->{"tags"} = { %{$usertags} };
     $user->write();
@@ -400,13 +400,13 @@ Wraps a line to a specific length by splitting at commas
 
 sub _wrap_to_length {
     my ($content,$line_length) = @_;
-    my $current_line_length;
+    my $current_line_length = 0;
     my $result = "";
     while ($content =~ m/^([^,]*,\s*)(.*)$/ || $content =~ m/^([^,]+)()$/) {
         my $current_word = $1;
         $content = $2;
         if ($current_line_length != 0 and
-           $current_line_length + length($current_word) <= $line_length) {
+           $current_line_length + length($current_word) > $line_length) {
            $result .= "\n ";
            $current_line_length = 1;
        }
@@ -422,4 +422,3 @@ sub _wrap_to_length {
 1;
 
 __END__
-# -*- cperl-set-style: PerlStyle -*-