diff options
| author | Andreas Gruenbacher <agruen@suse.de> | 2005-12-08 16:46:14 +0000 |
|---|---|---|
| committer | Andreas Gruenbacher <agruen@suse.de> | 2005-12-08 16:46:14 +0000 |
| commit | 5d67b7c1bb0cbf5550449756877ecae1a15101f8 (patch) | |
| tree | 53015310e6b8934cc5f1a65ee3820b2c17457a38 | |
| parent | 10fc7b66402be353d3bac4a10d08838f6eba9701 (diff) | |
| download | quilt-5d67b7c1bb0cbf5550449756877ecae1a15101f8.tar.gz | |
- scripts/inspect.in (setup command): add heuristic to check for
input files specified on the command line in the tar/patch
wrapper.
- quilt/diff.in: Degrade the ``More recent patches modify files
in patch'' message to a warning.
| -rw-r--r-- | quilt.changes | 10 | ||||
| -rw-r--r-- | quilt/diff.in | 3 | ||||
| -rw-r--r-- | scripts/inspect.in | 21 |
3 files changed, 28 insertions, 6 deletions
diff --git a/quilt.changes b/quilt.changes index c711d71..381dfb2 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Dec 8 17:45:41 CET 2005 - agruen@suse.de + +- scripts/inspect.in (setup command): add heuristic to check for + input files specified on the command line in the tar/patch + wrapper. +- quilt/diff.in: Degrade the ``More recent patches modify files + in patch'' message to a warning. + +------------------------------------------------------------------- Thu Dec 1 11:56:33 CET 2005 - mquinson@debian.org - bin/guards.in: s/ocnfiguration/configuration/ diff --git a/quilt/diff.in b/quilt/diff.in index 9e575d7..27c2503 100644 --- a/quilt/diff.in +++ b/quilt/diff.in @@ -411,9 +411,8 @@ done if [ -n "$files_were_shadowed" ] then - printf $"More recent patches modify files in patch %s\n" \ + printf $"Warning: more recent patches modify files in patch %s\n" \ "$(print_patch $last_patch)" >&2 - die 1 fi die 0 ### Local Variables: diff --git a/scripts/inspect.in b/scripts/inspect.in index 83f2db3..5de5009 100644 --- a/scripts/inspect.in +++ b/scripts/inspect.in @@ -139,11 +139,20 @@ cat <<-'EOF' > $tmpdir/bin/wrapper fi } - # put data into tmpfile + for file in "$@"; do + if [ -e "${file#-i}" ]; then + inputfile=${file#-i} + break + fi + done tmpdir=${RPM_BUILD_DIR%/*} - cat > $tmpdir/data + rm -f $tmpdir/data + if [ -z "$inputfile" ]; then + # put data from stdin into tmpfile + cat > $tmpdir/data + fi - unpackfile="$(original_file $tmpdir/data)" + unpackfile="$(original_file ${inputfile:-$tmpdir/data})" if [ -n "$unpackfile" ] then dir=${PWD/$RPM_BUILD_DIR} @@ -163,7 +172,11 @@ cat <<-'EOF' > $tmpdir/bin/wrapper fi PATH=${PATH#*:} - ${0##*/} "$@" < $tmpdir/data + if [ -n "$inputfile" ]; then + ${0##*/} "$@" + else + ${0##*/} "$@" < $tmpdir/data + fi EOF chmod 755 $tmpdir/bin/wrapper ln -s wrapper $tmpdir/bin/patch |