The following commit has been merged in the master branch:
commit 8fc97bc94c08f4da2f18c3f4aa43db148bd8f6e2
Author: Guillem Jover <[email protected]>
Date: Wed Mar 2 01:37:28 2011 +0100
dpkg-divert: Honour --local when DPKG_MAINTSCRIPT_PACKAGE is present
Regression introduced in commit dc98261980767f258046f8a4c2e020fcdc92c8b6-
Reported-by: Martin Pitt <[email protected]>
Suggested-by: Colin Watson <[email protected]>
diff --git a/src/divertcmd.c b/src/divertcmd.c
index 706f785..cb46e92 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)
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
