[PATCH] Makefile: Remove excess backslashes from sed

Brian Gernhardt· Apr 9, 2010, 14:41 UTC · lore

The sed script that was intended to add lines altering the sys.path had extra backslashes in them. Instead resulting in

  import sys;  import os;  sys.path.insert( ... )

It output

  import sys; \ import os; \ sys.path.insert( ... )

Unfortunately this caused python (2.6.1 on OS X 10.6.3) to error

  SyntaxError: unexpected character after line continuation character

Removing two of the backslashes solves this problem.

Signed-off-by: Brian Gernhardt <brian@gernhardtsoftware.com>
---
 Makefile |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Show changes to Makefile +2 −2

diff --git a/Makefile b/Makefile
index f0fe351..b9eb1ca 100644
--- a/Makefile
+++ b/Makefile
@@ -1632,8 +1632,8 @@ $(patsubst %.py,%,$(SCRIPT_PYTHON)): % : %.py
 	sed -e '1{' \
 	    -e '	s|#!.*python|#!$(PYTHON_PATH_SQ)|' \
 	    -e '}' \
-	    -e 's|^import sys.*|&; \\\
-	           import os; \\\
+	    -e 's|^import sys.*|&; \
+	           import os; \
 	           sys.path.insert(0, os.getenv("GITPYTHONLIB",\
 	                                        "@@INSTLIBDIR@@"));|' \
 	    -e 's|@@INSTLIBDIR@@|'"$$INSTLIBDIR"'|g' \

-- 
1.7.1.rc0.243.g2ce66

Brian Gernhardt· Apr 9, 2010, 14:44 UTC · re: Brian Gernhardt · lore

Re: [PATCH] Makefile: Remove excess backslashes from sed

This is the same patch as before.  I forgot --dry-run while testing git-send-email.  My apologies.

On Apr 9, 2010, at 10:41 AM, Brian Gernhardt wrote:

Show 42 quoted lines

> The sed script that was intended to add lines altering the sys.path
> had extra backslashes in them.  Instead resulting in
> 
>  import sys;  import os;  sys.path.insert( ... )
> 
> It output
> 
>  import sys; \ import os; \ sys.path.insert( ... )
> 
> Unfortunately this caused python (2.6.1 on OS X 10.6.3) to error
> 
>  SyntaxError: unexpected character after line continuation character
> 
> Removing two of the backslashes solves this problem.
> 
> Signed-off-by: Brian Gernhardt <brian@gernhardtsoftware.com>
> ---
> Makefile |    4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/Makefile b/Makefile
> index f0fe351..b9eb1ca 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -1632,8 +1632,8 @@ $(patsubst %.py,%,$(SCRIPT_PYTHON)): % : %.py
> 	sed -e '1{' \
> 	    -e '	s|#!.*python|#!$(PYTHON_PATH_SQ)|' \
> 	    -e '}' \
> -	    -e 's|^import sys.*|&; \\\
> -	           import os; \\\
> +	    -e 's|^import sys.*|&; \
> +	           import os; \
> 	           sys.path.insert(0, os.getenv("GITPYTHONLIB",\
> 	                                        "@@INSTLIBDIR@@"));|' \
> 	    -e 's|@@INSTLIBDIR@@|'"$$INSTLIBDIR"'|g' \
> -- 
> 1.7.1.rc0.243.g2ce66
> 
> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

patchMakefile: Remove excess backslashes from sed