Felix Lechner pushed to branch master at lintian / lintian
Commits:
- 
6c7539b7
by Felix Lechner at 2022-01-23T13:34:51-08:00
3 changed files:
Changes:
| ... | ... | @@ -208,8 +208,12 @@ if (exists $command_line{'hide-overrides'}) { | 
| 208 | 208 |      );
 | 
| 209 | 209 |  }
 | 
| 210 | 210 |  | 
| 211 | -$command_line{'tag-display-limit'} = 0
 | |
| 212 | -  if exists $command_line{'no-tag-display-limit'};
 | |
| 211 | +if (exists $command_line{'no-tag-display-limit'}) {
 | |
| 212 | +    $command_line{'tag-display-limit'} = 0;
 | |
| 213 | +    warn encode_utf8(
 | |
| 214 | +"A future release will drop --no-tag-display-limit; please use '--tag-display-limit 0' instead.\n"
 | |
| 215 | +    );
 | |
| 216 | +}
 | |
| 213 | 217 |  | 
| 214 | 218 |  my $LINTIAN_CFG = $command_line{cfg};
 | 
| 215 | 219 |  | 
| ... | ... | @@ -1024,18 +1028,16 @@ Behavior options: | 
| 1024 | 1028 |      --pedantic                display "P:" tags (normally suppressed)
 | 
| 1025 | 1029 |      --profile X               Use the profile X or use vendor X checks
 | 
| 1026 | 1030 |      --show-overrides          output tags that have been overridden
 | 
| 1027 | -    --hide-overrides          do not output tags that have been overridden (default)
 | |
| 1028 | 1031 |      --suppress-tags T,...     don't show the specified tags
 | 
| 1029 | 1032 |      --suppress-tags-from-file X don't show the tags listed in file X
 | 
| 1030 | -    --tag-display-limit X     Specify "tag per package" display limit
 | |
| 1031 | -    --no-tag-display-limit    Disable "tag per package" display limit
 | |
| 1032 | -                              (equivalent to --tag-display-limit=0)
 | |
| 1033 | +    --tag-display-limit NUM   Specify "tag per package" display limit
 | |
| 1034 | + | |
| 1033 | 1035 |  Configuration options:
 | 
| 1034 | 1036 |      --cfg CONFIGFILE          read CONFIGFILE for configuration
 | 
| 1035 | 1037 |      --no-cfg                  do not read any config files
 | 
| 1036 | 1038 |      --ignore-lintian-env      ignore LINTIAN_* env variables
 | 
| 1037 | 1039 |      --include-dir DIR         include checks, libraries (etc.) from DIR
 | 
| 1038 | -    -j X, --jobs X            limit the number of parallel unpacking jobs to X
 | |
| 1040 | +    -j NUM, --jobs NUM        limit the number of parallel jobs to NUM
 | |
| 1039 | 1041 |      --[no-]user-dirs          whether to use files from user directories
 | 
| 1040 | 1042 |  | 
| 1041 | 1043 |  Some options were omitted. Please check the manual page for the complete list.
 | 
| ... | ... | @@ -257,7 +257,7 @@ sub print_hint { | 
| 257 | 257 |            if $emitted_count >= $limit;
 | 
| 258 | 258 |  | 
| 259 | 259 |          my $msg
 | 
| 260 | -          = ' ... use --no-tag-display-limit to see all (or pipe to a file/program)';
 | |
| 260 | +          = ' ... use "--tag-display-limit 0" to see all (or pipe to a file/program)';
 | |
| 261 | 261 |          $information = $self->_quote_print($msg)
 | 
| 262 | 262 |            if $emitted_count >= $limit-1;
 | 
| 263 | 263 |      }
 | 
| ... | ... | @@ -230,7 +230,10 @@ addition to the lintian error tags. To print a long tag description | 
| 230 | 230 |  without running lintian, see L<lintian-explain-tags(1)> or check
 | 
| 231 | 231 |  the website at https://lintian.debian.org.
 | 
| 232 | 232 |  | 
| 233 | -This option overrides B<info> variable in the configuration file.
 | |
| 233 | +To negate it, please use B<--no-info>.
 | |
| 234 | + | |
| 235 | +This option overrides B<info> (or B<no-info>) variable in the configuration
 | |
| 236 | +file.
 | |
| 234 | 237 |  | 
| 235 | 238 |  =item B<-I>, B<--display-info>
 | 
| 236 | 239 |  | 
| ... | ... | @@ -331,7 +334,7 @@ If not specified, the default value is I<{VENDOR}/main>. | 
| 331 | 334 |  Please Refer to the Lintian User Manual for the full documentation of
 | 
| 332 | 335 |  profiles.
 | 
| 333 | 336 |  | 
| 334 | -=item B<--show-overrides>, B<--hide-overrides>
 | |
| 337 | +=item B<--show-overrides>
 | |
| 335 | 338 |  | 
| 336 | 339 |  Controls whether tags that have been overridden should be shown.
 | 
| 337 | 340 |  | 
| ... | ... | @@ -343,9 +346,10 @@ also be displayed (unless --quiet is used). Please refer to the Lintian | 
| 343 | 346 |  User Manual for the documentation on how lintian relates comments to a
 | 
| 344 | 347 |  given override.
 | 
| 345 | 348 |  | 
| 349 | +To negate it, please use B<--no-show-overrides>.
 | |
| 346 | 350 |  | 
| 347 | -These options override the B<show-overrides> variable in the
 | |
| 348 | -configuration file.
 | |
| 351 | +This option overrides the B<show-overrides> (or B<no-show-overrides>) variable
 | |
| 352 | +in the configuration file.
 | |
| 349 | 353 |  | 
| 350 | 354 |  =item B<--suppress-tags> tag1,tag2,...
 | 
| 351 | 355 |  | 
| ... | ... | @@ -371,19 +375,17 @@ the exit status of Lintian. | 
| 371 | 375 |  Tags parsed from the file will be handled as if they had been given to
 | 
| 372 | 376 |  the B<--suppress-tags> option (e.g. ignored if B<--tags> is used).
 | 
| 373 | 377 |  | 
| 374 | -=item B<--tag-display-limit>[=X]
 | |
| 378 | +=item B<--tag-display-limit>[=NUM]
 | |
| 375 | 379 |  | 
| 376 | 380 |  By default, lintian limits itself to emitting at most 4 instances of each
 | 
| 377 | -tag per processable when STDOUT is a TTY.  This option specified that limit.
 | |
| 378 | -See also B<--no-tag-display-limit>.
 | |
| 381 | +tag per processable when STDOUT is a TTY.  This option specifies that limit.
 | |
| 379 | 382 |  | 
| 380 | -=item B<--no-tag-display-limit>
 | |
| 383 | +When STDOUT is not a TTY, lintian has no limit.
 | |
| 381 | 384 |  | 
| 382 | -By default, lintian limits itself to emitting at most 4 instances of each
 | |
| 383 | -tag per processable when STDOUT is a TTY.  This option disables that limit.
 | |
| 385 | +To disable the limit, please use a value of zero.
 | |
| 384 | 386 |  | 
| 385 | -When STDOUT is not a TTY, lintian has no limit. See also
 | |
| 386 | -B<--tag-display-limit>.
 | |
| 387 | +This option overrides the B<tag-display-limit> variable in the
 | |
| 388 | +configuration file.
 | |
| 387 | 389 |  | 
| 388 | 390 |  =back
 | 
| 389 | 391 |  |