RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: bash Date: 09-May-2009 18:20:33
Branch: HEAD Handle: 2009050916203201
Modified files:
bash parse.y patchlevel.h
Log:
- jbj: apply bash40-017.
Summary:
Revision Changes Path
1.9 +1 -1 bash/parse.y
1.18 +1 -1 bash/patchlevel.h
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: bash/parse.y
============================================================================
$ cvs diff -u -r1.8 -r1.9 parse.y
--- bash/parse.y 9 May 2009 16:16:49 -0000 1.8
+++ bash/parse.y 9 May 2009 16:20:32 -0000 1.9
@@ -1879,7 +1879,7 @@
prompt_again ();
ret = read_a_line (remove_quoted_newline);
#if defined (HISTORY)
- if (remember_on_history && (parser_state & PST_HEREDOC))
+ if (ret && remember_on_history && (parser_state & PST_HEREDOC))
{
/* To make adding the the here-document body right, we need to rely
on history_delimiting_chars() returning \n for the first line of
@@ .
patch -p0 <<'@@ .'
Index: bash/patchlevel.h
============================================================================
$ cvs diff -u -r1.17 -r1.18 patchlevel.h
--- bash/patchlevel.h 9 May 2009 16:19:57 -0000 1.17
+++ bash/patchlevel.h 9 May 2009 16:20:33 -0000 1.18
@@ -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 16
+#define PATCHLEVEL 17
#endif /* _PATCHLEVEL_H_ */
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
