diff options
| author | Jean Delvare <khali@linux-fr.org> | 2006-04-19 06:57:11 +0000 |
|---|---|---|
| committer | Jean Delvare <khali@linux-fr.org> | 2006-04-19 06:57:11 +0000 |
| commit | d2c4c23e360607dfe549565665ac21cce15dedf3 (patch) | |
| tree | 6115e88962d8c2e0c3c3d46178429c7b3cc47f1e | |
| parent | f6a8ae7df0cec110350fc6016868c09b4facbcb7 (diff) | |
| download | quilt-d2c4c23e360607dfe549565665ac21cce15dedf3.tar.gz | |
- compat/getopt.in: Ignore option -q, rather than failing on it.
This prevents the test suite from failing on patch-wrapper
when --without-getopt is used. Reported by Markus Oberhumer.
| -rw-r--r-- | compat/getopt.in | 3 | ||||
| -rw-r--r-- | quilt.changes | 7 |
2 files changed, 9 insertions, 1 deletions
diff --git a/compat/getopt.in b/compat/getopt.in index 5621a62..0bcf7b9 100644 --- a/compat/getopt.in +++ b/compat/getopt.in @@ -38,7 +38,8 @@ my @long_opts; # nothing fancy to see here; this script provides minimal compatibility # with the getopt from util-linux until a cross platform binary exists. -if ($opts =~ /^\s*-o ([a-zA-Z:]*)?(\s+--long .*)*/) { +# We silently ignore option -q. +if ($opts =~ /^\s*(?:-q\s+)?-o ([a-zA-Z:]*)?(\s+--long .*)*/) { $short_opts = $1; if ($2) { my $long_opts = $2; diff --git a/quilt.changes b/quilt.changes index 6712f59..04bbf46 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Apr 19 08:50:55 CEST 2006 - khali@linux-fr.org + +- compat/getopt.in: Ignore option -q, rather than failing on it. + This prevents the test suite from failing on patch-wrapper + when --without-getopt is used. Reported by Markus Oberhumer. + +------------------------------------------------------------------- Sat Apr 15 16:52:12 CEST 2006 - khali@linux-fr.org - compat/getopt.in: Remove duplicate test. |