Laurent Bigonville wrote... > Apparently, quilt refresh is not honoring the QUILT_REFRESH_ARGS > environment variable anymore. > > Setting it in the .quiltrc file seems to work though
The reason for this is a change between the wheezy and jessie versions
of quilt when the package started shipping /etc/quilt.quiltrc by
removing an dh_auto_install override in debian/rules.
So the workaround is to remove that file locally. A better solution
was to change that file in a way any pre-existing QUILT_* is
preserved, as shown below. This is also the behaviour I'd expect.
Christoph
--- /etc/quilt.quiltrc 2014-06-17 09:04:43.000000000 +0200
+++ /etc/quilt.quiltrc 2015-12-06 13:57:29.985786550 +0100
@@ -1,22 +1,22 @@
# Example /etc/quilt.quiltrc
# Options passed to GNU diff when generating patches
-QUILT_DIFF_OPTS="--show-c-function"
+: "${QUILT_DIFF_OPTS=--show-c-function}"
# Options passed to GNU patch when applying patches.
# (For appling patches which are not in unified format, remove the
"--unified".)
#QUILT_PATCH_OPTS="--ignore-whitespace"
-QUILT_PATCH_OPTS="--unified"
+: "${QUILT_PATCH_OPTS=--unified}"
# Options passed to diffstat when generating patch statistics
#QUILT_DIFFSTAT_OPTS="-f0"
# Options to pass to commands (QUILT_${COMMAND}_ARGS)
-QUILT_PUSH_ARGS="--color=auto"
-QUILT_DIFF_ARGS="--no-timestamps --color=auto"
-QUILT_REFRESH_ARGS="--no-timestamps --backup"
-QUILT_SERIES_ARGS="--color=auto"
-QUILT_PATCHES_ARGS="--color=auto"
+: "${QUILT_PUSH_ARGS=--color=auto}"
+: "${QUILT_DIFF_ARGS=--no-timestamps --color=auto}"
+: "${QUILT_REFRESH_ARGS=--no-timestamps --backup}"
+: "${QUILT_SERIES_ARGS=--color=auto}"
+: "${QUILT_PATCHES_ARGS=--color=auto}"
# When non-default less options are used, add the -R option so that less
outputs
# ANSI color escape codes "raw".
@@ -30,7 +30,7 @@
#QUILT_PATCHES=patches
# Prefix all patch names with the relative path to the patch?
-QUILT_PATCHES_PREFIX=yes
+: ${QUILT_PATCHES_PREFIX=yes}
# Use a specific editor for quilt (defaults to the value of $EDITOR before
# sourcing this configuration file, or vi if $EDITOR wasn't set).
signature.asc
Description: Digital signature
