diff options
| author | Holger Levsen <holger@debian.org> | 2025-11-30 10:59:09 +0100 |
|---|---|---|
| committer | git-ubuntu importer <ubuntu-devel-discuss@lists.ubuntu.com> | 2025-11-30 16:28:39 +0000 |
| commit | 1a0a913d777321ca59034c8ffff977cadd3ef1af (patch) | |
| tree | 0487ff2384297b50558a1bd423cabdb6273e42d4 /scripts/debdiff.pl | |
| parent | 6d666c8731998cdbcb7933787f47a7be291616ee (diff) | |
2.25.28 (patches unapplied)HEADimport/2.25.28ubuntu/resolute-proposedubuntu/resolute-develubuntu/develdebian/sid
Imported using git-ubuntu import.
Notes
Notes:
[ Guillem Jover ]
* debdiff: Add support for new --no-check option. Closes: #1016135.
* Pass also no_check to Dpkg::IPC spawn() and wait_child().
[ Hugh McMaster ]
* uscan/Git.pm:
- Set $newfile as a remote reference in upstream mode. Closes: #1120533.
- Remove 'eval' wrapper.
- Update 'git upstream' code path and debug output.
- Call 'show-ref' and 'ls-remote' with '--tags'.
* uscan/WatchSource.pm: Update some output messages.
[ Yadd ]
* uscan:
- accept also "Dist" into Github template like other templates.
- improve default Uversion-Mangle to cover trailing dot or dash and
uppercase. Thanks to Jonas Smedegaard. Closes: #1112452.
* Update French translations.
[ Daniel Gröber ]
* bts: browse:
- Push down $caching check. Closes: #1121335.
- Fix background download with blocking browsers.
- Fix background child inadvertently executing commands.
Diffstat (limited to 'scripts/debdiff.pl')
| -rwxr-xr-x | scripts/debdiff.pl | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/scripts/debdiff.pl b/scripts/debdiff.pl index 9158f93f..20bc1bfa 100755 --- a/scripts/debdiff.pl +++ b/scripts/debdiff.pl @@ -87,6 +87,7 @@ Valid options are: --quiet, -q Be quiet if no differences were found --exclude PATTERN Exclude files whose basenames match PATTERN --ignore-space, -w Ignore whitespace in diffs + --no-check Do not check signatures and checksums before unpacking --diffstat Include the result of diffstat before the diff --no-diffstat Do not do so (default) --auto-ver-sort When comparing source packages, ensure the @@ -127,6 +128,7 @@ my $controlfiles = 'control'; my $show_moved = 0; my $wdiff_opt = ''; my @diff_opts = (); +my $check_source = 1; my $show_diffstat = 0; my $wdiff_source_control = 0; my $auto_ver_sort = 0; @@ -149,6 +151,7 @@ if (@ARGV and $ARGV[0] =~ /^--no-?conf$/) { 'DEBDIFF_CONTROLFILES' => 'control', 'DEBDIFF_SHOW_MOVED' => 'no', 'DEBDIFF_WDIFF_OPT' => '', + 'DEBDIFF_CHECK_SOURCE' => 'yes', 'DEBDIFF_SHOW_DIFFSTAT' => 'no', 'DEBDIFF_WDIFF_SOURCE_CONTROL' => 'no', 'DEBDIFF_AUTO_VER_SORT' => 'no', @@ -177,6 +180,8 @@ if (@ARGV and $ARGV[0] =~ /^--no-?conf$/) { or $config_vars{'DEBDIFF_CONTROL'} = 'yes'; $config_vars{'DEBDIFF_SHOW_MOVED'} =~ /^(yes|no)$/ or $config_vars{'DEBDIFF_SHOW_MOVED'} = 'no'; + $config_vars{'DEBDIFF_CHECK_SOURCE'} =~ /^(yes|no)$/ + or $config_vars{'DEBDIFF_CHECK_SOURCE'} = 'yes'; $config_vars{'DEBDIFF_SHOW_DIFFSTAT'} =~ /^(yes|no)$/ or $config_vars{'DEBDIFF_SHOW_DIFFSTAT'} = 'no'; $config_vars{'DEBDIFF_WDIFF_SOURCE_CONTROL'} =~ /^(yes|no)$/ @@ -208,6 +213,7 @@ if (@ARGV and $ARGV[0] =~ /^--no-?conf$/) { $controlfiles = $config_vars{'DEBDIFF_CONTROLFILES'}; $show_moved = $config_vars{'DEBDIFF_SHOW_MOVED'} eq 'yes' ? 1 : 0; $wdiff_opt = $config_vars{'DEBDIFF_WDIFF_OPT'} =~ /^-([plt])$/ ? $1 : ''; + $check_source = $config_vars{'DEBDIFF_CHECK_SOURCE'} eq 'yes' ? 1 : 0; $show_diffstat = $config_vars{'DEBDIFF_SHOW_DIFFSTAT'} eq 'yes' ? 1 : 0; $wdiff_source_control = $config_vars{'DEBDIFF_WDIFF_SOURCE_CONTROL'} eq 'yes' ? 1 : 0; @@ -320,6 +326,9 @@ while (@ARGV) { } elsif ($ARGV[0] =~ /^(--ignore-space|-w)$/) { push @diff_opts, "-w"; shift; + } elsif ($ARGV[0] eq '--no-check') { + $check_source = 0; + shift; } elsif ($ARGV[0] eq '--diffstat') { $show_diffstat = 1; shift; @@ -714,6 +723,9 @@ if ($type eq 'deb') { for my $i (1, 2) { no strict 'refs'; my @opts = ('-x'); + if ($check_source eq 'no') { + push @opts, '--no-check'; + } if ($dscformats[$i] eq '3.0 (quilt)' && !$apply_patches) { push @opts, '--skip-patches'; } |