From owner-svn-soc-all@FreeBSD.ORG  Tue Jun  5 11:05:01 2012
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@FreeBSD.org
Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f])
	by hub.freebsd.org (Postfix) with SMTP id F09ED106564A
	for <svn-soc-all@FreeBSD.org>; Tue,  5 Jun 2012 11:04:58 +0000 (UTC)
	(envelope-from tzabal@FreeBSD.org)
Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation);
	Tue, 05 Jun 2012 11:04:58 +0000
Date: Tue, 05 Jun 2012 11:04:58 +0000
From: tzabal@FreeBSD.org
To: svn-soc-all@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-Id: <20120605110458.F09ED106564A@hub.freebsd.org>
Cc: 
Subject: socsvn commit: r237124 -
	soc2012/tzabal/client-side/akcrs-head/usr.sbin/crashreport
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
	<svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 05 Jun 2012 11:05:01 -0000

Author: tzabal
Date: Tue Jun  5 11:04:58 2012
New Revision: 237124
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=237124

Log:
  Updated version of crashreport. Include a section of the patch (about email checking) that I did not have in my last commit.

Modified:
  soc2012/tzabal/client-side/akcrs-head/usr.sbin/crashreport/crashreport.sh

Modified: soc2012/tzabal/client-side/akcrs-head/usr.sbin/crashreport/crashreport.sh
==============================================================================
--- soc2012/tzabal/client-side/akcrs-head/usr.sbin/crashreport/crashreport.sh	Tue Jun  5 10:23:41 2012	(r237123)
+++ soc2012/tzabal/client-side/akcrs-head/usr.sbin/crashreport/crashreport.sh	Tue Jun  5 11:04:58 2012	(r237124)
@@ -117,13 +117,13 @@
 
 ## Find the email that will be used for contact
 if [ -z "${_email}" ]; then
-	# email of /etc/rc.conf
-	_email="${email}"
-fi
-
-if [ -z "${_email}" ]; then
-	error 'No email address for contact is specified.'
-	exit 6
+	if [ -n "${email}" ]; then
+		# email of /etc/rc.conf
+		_email="${email}"
+	else
+		error 'No email address for contact is specified.'
+		exit 6
+	fi
 fi
 
 # Check if the given email address is valid based on its format.