logbuch: comparison log.pl

equal deleted inserted replaced

-:a918a61afe98
+:b1954e2f261c
 use File::Temp qw(tempfile);
 use File::stat;
 use Getopt::Long;
 use Mail::Mailer;
 use DBI;
+use MIME::QuotedPrint;
 use lib "/etc/logbuch";
 use config;
 # print @config::mailto, "\n";
 my $MAGIC = "#--- all changes below are ignored ---#\n";
 my $opt_db = 1;
 my $opt_mail = 1;
 my $opt_message = "";
+my $opt_apt = "";
 my $Dbh;
 MAIN: {
 GetOptions("db!" => \$opt_db,
 	"mail!" => \$opt_mail,
-	"message=s" => \$opt_message)
+	"message=s" => \$opt_message,
-	or die eval "\"$USAGE\"";
+	"type=s" => \$opt_apt,
+) or die eval "\"$USAGE\"";
 if ($opt_message =~ /^\.?\// and -f $opt_message) {
 	@ARGV = ($opt_message);
 	$opt_message = join "", <>;
 } elsif ($opt_message eq "-") {
 	$opt_message = join "", <STDIN>;
+} elsif ($opt_message =~ /^((?:dist-)?upgrade):(.*)/) {
+	open(I, $2) or die "Can't open $2: $!\n";
+	$opt_message = "$1\n"
+	    . join "", grep /^(?:Inst|Conf|Remv)/, <I>;
+	die $opt_message;
 }
 if ($opt_message =~ /\n/) {
 	$opt_message =~ s/\n/\n    /g;
 }
 	    my $mailer = new Mail::Mailer "sendmail"
 		or die "Can't create Mailer: $!\n";
 	    my $subject = (split /\n/, $text)[0];
 	    $subject =~ s/^\s*\S\s//;
-	    $subject = "Service [". hostname(). "]: $subject";
+	    $subject = encode_qp("Service [". hostname(). "]: $subject");
 	    $mailer->open({
 		"To" => $mailto,
 		"Subject" => $subject});
 	    print $mailer $head, "\n", $text;