diff options
| -rw-r--r-- | Makefile.in | 1 | ||||
| -rwxr-xr-x | bin/patch-wrapper.in | 4 | ||||
| -rw-r--r-- | quilt.changes | 7 |
3 files changed, 10 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in index 091c5ea..b5cfa07 100644 --- a/Makefile.in +++ b/Makefile.in @@ -252,6 +252,7 @@ $(patsubst %.in,%,$(wildcard bin/*.in quilt/*.in quilt/scripts/*.in)) :: Makefil -e 's:@QUILT_DIR''@:$(datadir)/$(PACKAGE):g' \ -e 's:@PERL''@:$(PERL):g' \ -e 's:@BASH''@:$(BASH):g' \ + -e 's:@PATCH''@:$(PATCH):g' \ -e 's:@VERSION''@:$(VERSION):g' \ -e 's:@RELEASE''@:$(RELEASE):g' \ -e 's:@LOCALEDIR''@:$(localedir):g' \ diff --git a/bin/patch-wrapper.in b/bin/patch-wrapper.in index caa600f..099feff 100755 --- a/bin/patch-wrapper.in +++ b/bin/patch-wrapper.in @@ -6,7 +6,7 @@ # options are used that this wrapper does not recognize, GNU patch is # used directly, and no quilt metadata will get created. -PATCH=patch +PATCH=@PATCH@ original_options=("$@") # GNU patch recognizes these environment variables @@ -53,7 +53,7 @@ backup_files() { elif [ -n "$opt_silent" ]; then cat > /dev/null fi - if [ "$backup_mode" = --backup ] + if [ "$backup_mode" = --backup -a -d "$dir" ] then for file in $(find "$dir" -type f -a ! -path "$path/.timestamp") do diff --git a/quilt.changes b/quilt.changes index b02dfb6..dbc9e8a 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Sat Feb 11 15:35:51 CET 2006 - agruen@suse.de + +- bin/patch-wrapper.in: Call GNU patch by absolute patch to avoid + recursion. Don't print an error message when a patch contains + no files. + +------------------------------------------------------------------- Sat Feb 11 15:15:07 CET 2006 - agruen@suse.de - quilt/setup.in: Add --path option for defining a tarball search |