If QUILT_PATCHES or QUILT_SERIES are set both in ~/.quiltrc and .pc/.quilt_patches (respectively .pc/.quilt_series), the former currently take precedence. This pretty much voids the value of per-project settings. Project settings should have the highest priority.
This fixes Savannah ticket #46498: https://savannah.nongnu.org/bugs/?46498 --- Raphael, you asked for the feature in the first place, are you OK with this change? quilt/scripts/patchfns.in | 4 ++-- test/project-settings.test | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) --- a/quilt/scripts/patchfns.in +++ b/quilt/scripts/patchfns.in @@ -1123,13 +1123,13 @@ fi if [ -r $QUILT_PC/.quilt_patches ] then - : ${QUILT_PATCHES:=$(< $QUILT_PC/.quilt_patches)} + QUILT_PATCHES=$(< $QUILT_PC/.quilt_patches) else : ${QUILT_PATCHES:=patches} fi if [ -r $QUILT_PC/.quilt_series ] then - : ${QUILT_SERIES:=$(< $QUILT_PC/.quilt_series)} + QUILT_SERIES=$(< $QUILT_PC/.quilt_series) else : ${QUILT_SERIES:=series} fi --- /dev/null +++ b/test/project-settings.test @@ -0,0 +1,22 @@ +# Project settings should take precedence over user settings +$ export QUILT_PATCHES=my_patches +$ export QUILT_SERIES=my_series + +$ mkdir quilt_patches +$ mkdir .pc +$ echo 2 > .pc/.version +$ echo quilt_patches > .pc/.quilt_patches +$ echo quilt_series > .pc/.quilt_series +$ echo create.patch > quilt_patches/quilt_series + +$ cat > quilt_patches/create.patch +< --- a/file +< +++ b/file +< @@ -0,0 +1 @@ +< +new line + +$ quilt push +> Applying patch quilt_patches/create.patch +> patching file file +> +> Now at patch quilt_patches/create.patch -- Jean Delvare SUSE L3 Support _______________________________________________ Quilt-dev mailing list [email protected] https://lists.nongnu.org/mailman/listinfo/quilt-dev
