diff options
| author | Jean Delvare <jdelvare@suse.de> | 2019-03-14 16:42:37 +0100 |
|---|---|---|
| committer | Jean Delvare <jdelvare@suse.de> | 2019-03-14 16:42:37 +0100 |
| commit | 991d4e55ad6409b4b3fb893dfbab3907601ba594 (patch) | |
| tree | 080de4c463c0251458c1a466fa77fa1f4c6db15f | |
| parent | f7b69c58d21903baacb290840e7bed9282e357e2 (diff) | |
| download | quilt-991d4e55ad6409b4b3fb893dfbab3907601ba594.tar.gz | |
setup: Align --fast on --slow for series files
Remove the requirement to unpack the source tree manually when using
the fast mode of quilt setup and the parameter is a series file.
Instead, let --fast behave exactly like --slow, so that both modes
can be used interchangeably.
Signed-off-by: Jean Delvare <jdelvare@suse.de>
| -rw-r--r-- | quilt/setup.in | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/quilt/setup.in b/quilt/setup.in index ccfb794..3545a28 100644 --- a/quilt/setup.in +++ b/quilt/setup.in @@ -295,8 +295,7 @@ Initializes a source tree from an rpm spec file or a quilt series file. --fast Use an alternative, faster method to process the spec file. In this mode, rpmbuild is told to generate a working tree directly in the - target directory. If the input is a series file, it is assumed that - all archives have been extracted manually beforehand. + target directory. " exit 0 else @@ -426,7 +425,9 @@ case "$1" in ;; esac -if [ -z "$QUILT_SETUP_FAST" ] +# If running on a spec file in fast mode, the source tree is already unpacked; +# in all other cases, we must prepare the source tree now +if [ -z "$QUILT_SETUP_FAST" -o -n "$series_file" ] then # Make sure that unpacking will not overwrite anything check_for_existing_directories || exit 1 |