diff options
| author | Andreas Gruenbacher <agruen@suse.de> | 2009-11-25 19:45:43 +0100 |
|---|---|---|
| committer | Andreas Gruenbacher <agruen@suse.de> | 2009-11-25 19:45:43 +0100 |
| commit | 62b91922afae74a05efcc00210a93da2daa56cbd (patch) | |
| tree | fa664d53d6a5d80edd09180a1845e015d9fc4c8a | |
| parent | 66f9da46333e3d268cd1dd429ff2d2a674450d80 (diff) | |
| download | quilt-62b91922afae74a05efcc00210a93da2daa56cbd.tar.gz | |
- inspect: When guessing the tarball filename, make sure that only
regular files are considered. (Otherwise, we will trip over
command lines like "tar xjCf dir file").
| -rw-r--r-- | quilt.changes | 7 | ||||
| -rw-r--r-- | quilt/scripts/inspect.in | 5 |
2 files changed, 11 insertions, 1 deletions
diff --git a/quilt.changes b/quilt.changes index 1229445..a8279c6 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Nov 25 19:44:18 CET 2009 - agruen@suse.de + +- inspect: When guessing the tarball filename, make sure that only + regular files are considered. (Otherwise, we will trip over + command lines like "tar xjCf dir file"). + +------------------------------------------------------------------- Wed Nov 25 18:36:12 CET 2009 - agruen@suse.de - new command: Add -p ... option (equivalent to diff -p ...). diff --git a/quilt/scripts/inspect.in b/quilt/scripts/inspect.in index ac631bd..3a5b9a8 100644 --- a/quilt/scripts/inspect.in +++ b/quilt/scripts/inspect.in @@ -189,8 +189,11 @@ cat <<-'EOF' > $tmpdir/bin/wrapper } tar_input_file() { + # FIXME: this is a very crude way of guessing, but the tar command line + # options are a total mess. + while [ $# -gt 0 ]; do - if [ -e "$1" ] + if [ -f "$1" ] then echo "$1" return |