summaryrefslogtreecommitdiff
path: root/src/divertcmd.c
diff options
context:
space:
mode:
authorGuillem Jover <guillem@debian.org>2011-03-02 01:37:28 +0100
committerGuillem Jover <guillem@debian.org>2011-03-02 07:35:01 +0100
commit8fc97bc94c08f4da2f18c3f4aa43db148bd8f6e2 (patch)
treefe0e4ad94d3fc01207979f564a442b47ad20b8c1 /src/divertcmd.c
parent598d605202413affb749a96bab8a39d60e6902ff (diff)
downloaddpkg-8fc97bc94c08f4da2f18c3f4aa43db148bd8f6e2.tar.gz
dpkg-divert: Honour --local when DPKG_MAINTSCRIPT_PACKAGE is present
Regression introduced in commit dc98261980767f258046f8a4c2e020fcdc92c8b6- Reported-by: Martin Pitt <martin.pitt@ubuntu.com> Suggested-by: Colin Watson <cjwatson@ubuntu.com>
Diffstat (limited to 'src/divertcmd.c')
-rw-r--r--src/divertcmd.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/divertcmd.c b/src/divertcmd.c
index 706f7850a..cb46e9274 100644
--- a/src/divertcmd.c
+++ b/src/divertcmd.c
@@ -716,7 +716,7 @@ main(int argc, const char * const *argv)
myopt(&argv, cmdinfos);
env_pkgname = getenv("DPKG_MAINTSCRIPT_PACKAGE");
- if (!opt_pkgname && env_pkgname)
+ if (opt_pkgname_match_any && env_pkgname)
setpackage(NULL, env_pkgname);
if (!cipaction)