about summary refs log tree commit homepage
path: root/script/public-inbox-mda
diff options
context:
space:
mode:
authorEric Wong <e@80x24.org>2016-04-25 09:50:01 +0000
committerEric Wong <e@80x24.org>2016-04-25 09:50:32 +0000
commitfe3d2447badd595df784541556311137b920b0a2 (patch)
tree6e37ab61406654680fd6757593cf810370055ecb /script/public-inbox-mda
parent51c59323fffbfbb6ebc60f58da905e88ac323da5 (diff)
downloadpublic-inbox-fe3d2447badd595df784541556311137b920b0a2.tar.gz
By converting to using ourt git-fast-import-based Import
module.  This should allow us to be more easily installed.
Diffstat (limited to 'script/public-inbox-mda')
-rwxr-xr-xscript/public-inbox-mda24
1 files changed, 13 insertions, 11 deletions
diff --git a/script/public-inbox-mda b/script/public-inbox-mda
index 24feeb81..6c76734c 100755
--- a/script/public-inbox-mda
+++ b/script/public-inbox-mda
@@ -15,6 +15,8 @@ use IPC::Run qw(run);
 use PublicInbox::MDA;
 use PublicInbox::Filter;
 use PublicInbox::Config;
+use PublicInbox::Import;
+use PublicInbox::Git;
 
 # n.b: hopefully we can setup the emergency path without bailing due to
 # user error, we really want to setup the emergency destination ASAP
@@ -58,20 +60,20 @@ if (PublicInbox::MDA->precheck($filter, $dst->{address}) &&
                         PublicInbox::MDA->set_list_headers($msg, $dst);
                         $filter->simple($msg);
 
-                        my ($name, $email, $date) =
-                                        PublicInbox::MDA->author_info($msg);
-
                         END {
                                 index_sync($main_repo) if ($? == 0);
                         };
-
-                        local $ENV{GIT_AUTHOR_NAME} = $name;
-                        local $ENV{GIT_AUTHOR_EMAIL} = $email;
-                        local $ENV{GIT_AUTHOR_DATE} = $date;
-                        local $ENV{GIT_COMMITTER_EMAIL} = $recipient;
-                        local $ENV{GIT_COMMITTER_NAME} = $dst->{listname};
-
-                        $filter->pipe(PublicInbox::MDA->cmd, $main_repo);
+                        my $git = PublicInbox::Git->new($main_repo);
+                        my $im = PublicInbox::Import->new($git,
+                                                $dst->{listname}, $recipient);
+                        if (defined $im->add($msg)) {
+                                $im->done;
+                                $filter->ignore; # exits
+                        }
+                        # this message is similar to what ssoma-mda shows:
+                        print STDERR "CONFLICT: Message-ID: ",
+                                $msg->header_obj->header_raw('Message-ID'),
+                                " exists\n";
                 }
         }
 } else {