From: Ian Campbell Date: Tue, 2 Jul 2013 14:09:56 +0000 (+0100) Subject: Tidy X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=7d87a7ef8974817291804eb29a10aa634338f42a;p=people%2Faperard%2Femesinae.git Tidy --- diff --git a/CGI/message.pl b/CGI/message.pl index e53baf1..c4f812a 100755 --- a/CGI/message.pl +++ b/CGI/message.pl @@ -67,8 +67,7 @@ if ( $mode =~ m,^part/([0-9]+)/?$, ) { $partid = $1; } -if ( $lookup_key eq "message" ) -{ +if ( $lookup_key eq "message" ) { $msg = Emesinae::Message->lookup_id( $dbh, $lookup_value ); } elsif ( $lookup_key eq "mid" ) { diff --git a/Emesinae/CGI/Message.pm b/Emesinae/CGI/Message.pm index 8a26a0c..7bbfea2 100644 --- a/Emesinae/CGI/Message.pm +++ b/Emesinae/CGI/Message.pm @@ -188,7 +188,7 @@ sub format_html ($;$) { hdr( "To", $m->{to}->stringify ), hdr( "Cc", $m->{cc}->stringify ), hdr( "Subject", $m->{subject}->stringify ), - hdr( "Date", $m->{date} ? $m->{date}->stringify : undef), + hdr( "Date", $m->{date} ? $m->{date}->stringify : undef ), hdr( "Message-ID", $m->{msgid} ) ) ) diff --git a/Emesinae/Message.pm b/Emesinae/Message.pm index 509d7ea..659e2a6 100644 --- a/Emesinae/Message.pm +++ b/Emesinae/Message.pm @@ -39,12 +39,12 @@ sub lookup_id { inserted => $inserted, msgtype => $msgtype, date => $date ? Mail::Field::Date->new( 'date', $date ) : undef, - from => Mail::Field::AddrList->new( 'from', $from ), - to => Mail::Field::AddrList->new( 'to', $to ), - cc => Mail::Field::AddrList->new( 'cc', $cc ), - id => $id, - msgid => $msgid, - subject => Mail::Field->new( 'subject', $subj ), + from => Mail::Field::AddrList->new( 'from', $from ), + to => Mail::Field::AddrList->new( 'to', $to ), + cc => Mail::Field::AddrList->new( 'cc', $cc ), + id => $id, + msgid => $msgid, + subject => Mail::Field->new( 'subject', $subj ), }; bless $self, $class; @@ -103,10 +103,10 @@ sub lookup_msgid { msgid => $msgid, msgtype => $msgtype, date => $date ? Mail::Field::Date->new( 'date', $date ) : undef, - from => Mail::Field::AddrList->new( 'from', $from ), - to => Mail::Field::AddrList->new( 'to', $to ), - cc => Mail::Field::AddrList->new( 'cc', $cc ), - subject => Mail::Field->new( 'subject', $subj ), + from => Mail::Field::AddrList->new( 'from', $from ), + to => Mail::Field::AddrList->new( 'to', $to ), + cc => Mail::Field::AddrList->new( 'cc', $cc ), + subject => Mail::Field->new( 'subject', $subj ), }; bless $self, $class; diff --git a/scripts/control.pl b/scripts/control.pl index da0b33a..13bd5a1 100755 --- a/scripts/control.pl +++ b/scripts/control.pl @@ -226,7 +226,7 @@ sub lookup_msgid ($) { my $msgid = parse_msgid(shift); my $msg = Emesinae::Message->lookup_msgid( $dbh, $msgid, Insert => 1 ); die "lookup_msgid or insert failed" unless $msg; - return $msg + return $msg; } sub lookup_bugid ($) { diff --git a/scripts/queuerunner.pl b/scripts/queuerunner.pl index d6126bf..f52fcf9 100755 --- a/scripts/queuerunner.pl +++ b/scripts/queuerunner.pl @@ -72,7 +72,8 @@ while (1) { $cc == $c || die "$cc $c $!"; my $status = $?; if ($status) { - print( STDERR "[$$] $id: process failed ($status $!) - now in [GP]$id\n" ) + print( STDERR + "[$$] $id: process failed ($status $!) - now in [GP]$id\n" ) || die $!; } print( STDOUT " done\n" ) || die $!;