This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch master in repository dpkg.
View the commit online: https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=eacbf48370ce977d7bc8e9af027afd0b79ef35a0 commit eacbf48370ce977d7bc8e9af027afd0b79ef35a0 Author: Guillem Jover <[email protected]> AuthorDate: Wed Aug 1 06:22:45 2018 +0200 man: Clarify awaiting state for interest and activate directives Closes: #904060 --- debian/changelog | 2 ++ man/deb-triggers.man | 31 +++++++++++++++++++++++++------ man/dpkg-trigger.man | 2 ++ 3 files changed, 29 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 19fa87c6a..4a6860404 100644 --- a/debian/changelog +++ b/debian/changelog @@ -160,6 +160,8 @@ dpkg (1.19.1) UNRELEASED; urgency=medium - Clarify arch-qualified dependency simplification in Dpkg::Deps POD. - Improve Dpkg::Deps modules and methods documentation. - Fix typo in deb-changes(5). Closes: #902616 + - Clarify awaiting state for interest and activate directives. + Closes: #904060 * Code internals: - Do not use stringy eval to define different sub implementations, just assign an anonymous sub to the typeglob. diff --git a/man/deb-triggers.man b/man/deb-triggers.man index dba9fca4d..9ab8d4ac3 100644 --- a/man/deb-triggers.man +++ b/man/deb-triggers.man @@ -43,9 +43,17 @@ The trigger control directives currently supported are: .IP Specifies that the package is interested in the named trigger. All triggers in which a package is interested must be listed using this -directive in the triggers control file. The “noawait” variant does -not put the triggering packages in triggers\-awaited state. This should -be used when the functionality provided by the trigger is not crucial. +directive in the triggers control file. +.IP +The “await” variants put the triggering package in triggers\-awaited +state depending on how the trigger was activated. +The “noawait” variant does not put the triggering packages in +triggers\-awaited state, even if the triggering package declared an +“await” activation (either with an \fBactivate\-await\fP or \fBactivate\fP +directive, or by using the \fBdpkg\-trigger\fP \fB\-\-no\-await\fP +command-line option). +The “noawait” variant should be used when the functionality provided +by the trigger is not crucial. .TP \fBactivate\fP \fItrigger-name\fP .TQ @@ -57,9 +65,13 @@ Arranges that changes to this package's state will activate the specified trigger. The trigger will be activated at the start of the following operations: unpack, configure, remove (including for the benefit of a conflicting package), purge and deconfigure. -The “noawait” variant does not put the triggering packages in -triggers\-awaited state. This should be used when the functionality -provided by the trigger is not crucial. +.IP +The “await” variants only put the triggering package in triggers\-awaited +state if the interest directive is also “await”. +The “noawait” variant never puts the triggering packages in +triggers\-awaited state. +The “noawait” variant should be used when the functionality provided +by the trigger is not crucial. .IP If this package disappears during the unpacking of another package the trigger will be activated when the disappearance is noted @@ -83,6 +95,13 @@ will lead to errors if used with an older dpkg. .PP The “\-await” alias variants are supported since dpkg 1.17.21, and will lead to errors if used with an older dpkg. +.PP +When a package provides an \fBinterest\-noawait\fP directive, any activation +will set the triggering package into “noawait” mode, regardless of the +awaiting mode requested by the activation (either “await” or “noawait”). +When a package provides an \fBinterest\fP or \fBinterest\-await\fP directive, +any activation will set the triggering package into “await” or “noawait“ +depending on how it was activated. . .SH SEE ALSO .BR dpkg\-trigger (1), diff --git a/man/dpkg-trigger.man b/man/dpkg-trigger.man index 5e4877144..f086f124d 100644 --- a/man/dpkg-trigger.man +++ b/man/dpkg-trigger.man @@ -74,6 +74,8 @@ the trigger. .TP .BR \-\-await This option does the inverse of \fB\-\-no\-await\fP (since dpkg 1.17.21). +If the interested package has declared a “noawait” directive, then this +option will not be effective. It is currently the default behavior. .TP .BR \-\-no\-act -- Dpkg.Org's dpkg
