diff options
| author | Andreas Gruenbacher <agruen@suse.de> | 2006-02-08 01:42:15 +0000 |
|---|---|---|
| committer | Andreas Gruenbacher <agruen@suse.de> | 2006-02-08 01:42:15 +0000 |
| commit | 43dd5be8775682a86f0835653497b5d707b00cf4 (patch) | |
| tree | 577964c002c4eea9870a145d7e2c1eb8f566955e | |
| parent | 94ee7d6715ddff0f780cb46c9b80dd2542411766 (diff) | |
| download | quilt-43dd5be8775682a86f0835653497b5d707b00cf4.tar.gz | |
- bin/patch-wrapper.in: Fix permissions of installed file.
- quilt/scripts/inspect.in: Improve recognition of patch's -i and
--input options.
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | quilt.changes | 11 | ||||
| -rw-r--r-- | quilt/scripts/inspect.in | 30 |
3 files changed, 36 insertions, 7 deletions
diff --git a/Makefile.in b/Makefile.in index 0230ffc..091c5ea 100644 --- a/Makefile.in +++ b/Makefile.in @@ -312,7 +312,7 @@ install-main :: scripts $(BUILD_ROOT)$(datadir)/$(PACKAGE)/scripts ifneq ($(PATCH_WRAPPER),) $(INSTALL) -d $(BUILD_ROOT)$(datadir)/$(PACKAGE)/wrapper - $(INSTALL) -m 644 bin/patch-wrapper \ + $(INSTALL) -m 755 bin/patch-wrapper \ $(BUILD_ROOT)$(datadir)/$(PACKAGE)/wrapper/patch endif diff --git a/quilt.changes b/quilt.changes index 00804ac..74119a8 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,15 @@ ------------------------------------------------------------------- +Wed Feb 8 02:03:27 CET 2006 - agruen@suse.de + +- bin/patch-wrapper.in: Fix permissions of installed file. + +------------------------------------------------------------------- +Wed Feb 8 00:32:10 CET 2006 - agruen@suse.de + +- quilt/scripts/inspect.in: Improve recognition of patch's -i and + --input options. + +------------------------------------------------------------------- Tue Feb 7 20:53:03 CET 2006 - agruen@suse.de - po/ja.po: Fix three errors: % used instead of %s (Yasushi Shoji). diff --git a/quilt/scripts/inspect.in b/quilt/scripts/inspect.in index bca4e6e..23675a7 100644 --- a/quilt/scripts/inspect.in +++ b/quilt/scripts/inspect.in @@ -141,14 +141,32 @@ cat <<-'EOF' > $tmpdir/bin/wrapper fi } - for file in "$@"; do - if [ -e "${file#-i}" ]; then - inputfile=${file#-i} - break - fi - done + input_option() { + while [ $# -gt 0 ]; do + case "$1" in + -i|--input) + if [ $# -ge 2 ]; then + echo "$2" + return + fi + ;; + -i*) + echo "${1#-i}" + return + ;; + --input=*) + echo "${1#--input=}" + return + ;; + esac + shift + done + return 1 + } + tmpdir=${RPM_BUILD_DIR%/*} rm -f $tmpdir/data + inputfile=$(input_option "$@") if [ -z "$inputfile" ]; then # put data from stdin into tmpfile cat > $tmpdir/data |