Commit 26995b06 authored by sikeda's avatar sikeda
Browse files

[-dev] Degressions by merge.


git-svn-id: https://subversion.renater.fr/sympa/branches/sympa-6.2-branch@10137 05aa8bb8-cd2b-0410-b1d7-8918dfa770ce
parent 642fe954
......@@ -124,7 +124,7 @@ my $options;
$options->{'stderr_to_tty'} = 1 if ($main::options{'foreground'});
$options->{'multiple_process'} = 0;
# Saves the pid number
# Saves the PID number
tools::write_pid('bulk', $$, $options);
unless ($options->{'stderr_to_tty'}) {
&tools::direct_stderr_to_file(('pid' => $$));
......
......@@ -112,8 +112,15 @@ sub next {
return undef;
}
if ($sth->rows == 0) {
&Log::do_log('info','Bulk packet is already locked');
if ($sth->rows < 0) {
Log::do_log('err',
'Unable to lock packet %s for message %s, though the query succeeded',
$packet->{'packetid'}, $packet->{'messagekey'}
);
return undef;
}
unless ($sth->rows) {
Log::do_log('info', 'Bulk packet is already locked');
return undef;
}
......
......@@ -221,8 +221,8 @@
sub _do_text_plain {
my $entity = shift;
if($entity->head->get('content-disposition') =~ /attachment/) {
return _do_other($entity);
if (($entity->head->get('Content-Disposition') || '') =~ /attachment/) {
return _do_other($entity);
}
my $thispart = $entity->bodyhandle->as_string;
......
......@@ -316,8 +316,8 @@ sub establish_connection {
## We set Long preload length to two times global max message size
## (because of base64 encoding) instead of defaulting to 80 on Oracle
## and 32768 on Sybase.
## This is to avoid error in Bulk::messageasstring when using Oracle
## or Sybase database:
## This is to avoid error in Bulk::messageasstring when using Oracle or
## Sybase database:
## bulk[pid]: internal error : current packet 'messagekey= 0c40f56e07d3c8ce34683b98d54b6575 contain a ref to a null message
## FIXME: would be better to use lists' setting, but
## * list config is not load()-ed at this point, and
......
......@@ -558,11 +558,6 @@ sub check_cpan {
package_name => 'libnet',
usage => 'this is required if you set \'list_check_smtp\' sympa.conf parameter, used to check existing aliases before mailing list creation.',
},
'OAuth::Lite' => {
package_name => 'OAuth-Lite',
required_version => '1.31',
usage => 'This is required if you want to use the VOOT protocol.',
},
'perl' => {
required_version =>'5.008',
},
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment