cscvs to tla changeset 83

[onak.git] / onak-mail.pl

diff --git a/onak-mail.pl b/onak-mail.pl
index 46763f3ec98a51b8491116e843cf7f6e499ebd57..0c75db60d18db92a2fd3d76d5d1016d91ed563ac 100755 (executable)
--- a/onak-mail.pl
+++ b/onak-mail.pl
@@ -7,6 +7,8 @@
 # Copyright 2002 Project Purple
 # Released under the GPL.
 #
+# $Id: onak-mail.pl,v 1.6 2003/06/04 20:57:11 noodles Exp $
+#
 
 use strict;
 use IPC::Open3;
@@ -59,8 +61,8 @@ sub submitupdate {
 
        print MERGEIN @data;
        close MERGEIN;
-       @errors = <MERGEERR>;
        @mergedata = <MERGEOUT>;
+       @errors = <MERGEERR>;
 
        open (LOG, ">>/home/noodles/onak-0.0.3/keyadd.log");
        print LOG "[".localtime(time)."] ", @errors;