($main::hostname, undef, undef, undef, undef) = gethostbyname(hostname());
my %packages = ();
-my $re_file_safe_prefix = qr/\A([a-zA-Z0-9][a-zA-Z0-9_.:~+-]*)/s;
+my $re_file_safe_prefix = qr/\A([a-zA-Z0-9.][a-zA-Z0-9_.:~+-]*)/s;
my $re_file_safe = qr/$re_file_safe_prefix\z/s;
# extract -r and -k args
my $commands = shift;
my ( @cmds, $cmd, $pgplines, $signator );
local (*COMMANDS);
- my ( @files, $file, @removed, $target_delay );
+ my ($file, @removed, $target_delay );
format_status_str( $main::current_changes, $commands );
$main::dstat = "c";
next if @word < 1;
if ( $word[0] eq "rm" ) {
+ my @files = ();
foreach ( @word[ 1 .. $#word ] ) {
my $origword = $_;
if (m,^DELAYED/([0-9]+)-day/,) {
my $package =
keys %main::packages ? join( ' ', keys %main::packages ) : "";
- use Email::Send;
-
- unless ( defined($Email::Send::Sendmail::SENDMAIL) ) {
- $Email::Send::Sendmail::SENDMAIL = $conf::mail;
- }
+ use Email::Sender::Simple;
if ($conf::overridemail) {
$addr = $conf::overridemail;
$message .= "\n$text";
$message .= "\nGreetings,\n\n\tYour Debian queue daemon (running on host $main::hostname)\n";
- my $mail = Email::Send->new;
- for (qw[Sendmail SMTP]) {
- $mail->mailer($_) and last if $mail->mailer_available($_);
- }
-
- my $ret = $mail->send($message);
- if ( $ret && $ret !~ /Message sent|success/ ) {
- return 0;
- }
-
- return 1;
+ return Email::Sender::Simple->try_to_send($message);
} ## end sub send_mail($$$)
#