From: Chet Ramey <chet.ramey@case.edu>
Date: Wed, 23 Nov 2011 01:03:03 +0000 (-0500)
Subject: Bash-4.2 patch 16
X-Git-Tag: bash-4.3~31
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b4a8651a5f48c673ae4aec4b191569b46bb89d41;p=thirdparty%2Fbash.git

Bash-4.2 patch 16
---

diff --git a/parse.y b/parse.y
index bf569e1e7..889e77df9 100644
--- a/parse.y
+++ b/parse.y
@@ -2499,7 +2499,7 @@ yylex ()
 	 We do this only if it is time to do so. Notice that only here
 	 is the mail alarm reset; nothing takes place in check_mail ()
 	 except the checking of mail.  Please don't change this. */
-      if (prompt_is_ps1 && time_to_check_mail ())
+      if (prompt_is_ps1 && parse_and_execute_level == 0 && time_to_check_mail ())
 	{
 	  check_mail ();
 	  reset_mail_timer ();
diff --git a/patchlevel.h b/patchlevel.h
index 05c9cc3ab..dd41e764a 100644
--- a/patchlevel.h
+++ b/patchlevel.h
@@ -25,6 +25,6 @@
    regexp `^#define[ 	]*PATCHLEVEL', since that's what support/mkversion.sh
    looks for to find the patch level (for the sccs version string). */
 
-#define PATCHLEVEL 15
+#define PATCHLEVEL 16
 
 #endif /* _PATCHLEVEL_H_ */