Bash-4.2 patch 16

diff --git a/parse.y b/parse.y
index bf569e1e7343ae7b302a25fb12ccf4094d8a677f..889e77df92a42ea204f3995ffeaff457d1a0de32 100644 (file)
--- 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 05c9cc3ab1c4482dfbfc3d7b27fa7f44bb7bc751..dd41e764a73c36a6ba6e14b65533e9b123e8907c 100644 (file)
--- 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_ */