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 <[email protected]> --- Not sure what I had in mind back then, to get the behavior wrong AND document it as such... Sorry about that. quilt/setup.in | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) --- quilt.orig/quilt/setup.in 2019-03-11 15:38:28.185741055 +0100 +++ quilt/quilt/setup.in 2019-03-11 15:47:33.253573117 +0100 @@ -295,8 +295,7 @@ Initializes a source tree from an rpm sp --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 -- Jean Delvare SUSE L3 Support _______________________________________________ Quilt-dev mailing list [email protected] https://lists.nongnu.org/mailman/listinfo/quilt-dev
