On 03/04/24 at 14:25 -0300, Antonio Terceiro wrote: > On Sun, Mar 03, 2024 at 11:23:28AM +0100, Lucas Nussbaum wrote: > > Package: devscripts > > Version: 2.23.4+deb12u1 > > Severity: normal > > Tags: patch > > > > Hi, > > > > $ chdist list > > given is deprecated at /usr/bin/chdist line 710. > > when is deprecated at /usr/bin/chdist line 711. > > when is deprecated at /usr/bin/chdist line 714. > > when is deprecated at /usr/bin/chdist line 717. > > when is deprecated at /usr/bin/chdist line 720. > > when is deprecated at /usr/bin/chdist line 723. > > when is deprecated at /usr/bin/chdist line 726. > > when is deprecated at /usr/bin/chdist line 729. > > when is deprecated at /usr/bin/chdist line 732. > > when is deprecated at /usr/bin/chdist line 735. > > when is deprecated at /usr/bin/chdist line 738. > > when is deprecated at /usr/bin/chdist line 741. > > when is deprecated at /usr/bin/chdist line 744. > > when is deprecated at /usr/bin/chdist line 747. > > when is deprecated at /usr/bin/chdist line 750. > > when is deprecated at /usr/bin/chdist line 753. > > when is deprecated at /usr/bin/chdist line 756. > > when is deprecated at /usr/bin/chdist line 759. > > when is deprecated at /usr/bin/chdist line 762. > > > > Attached is a patch that switches to if...elsif instead. > > You forgot the attachment. :-)
Oops, here it is. Lucas
--- devscripts/scripts/chdist.pl 2024-02-27 09:03:18.704791412 +0100
+++ /usr/bin/chdist 2024-03-03 11:19:51.003517675 +0100
@@ -707,72 +707,70 @@
my $recursed = 0;
MAIN:
my $command = shift @ARGV;
-given ($command) {
- when ('create') {
- dist_create(@ARGV);
- }
- when ('apt') {
- aptcmd('apt', @ARGV);
- }
- when ('apt-get') {
- aptcmd('apt-get', @ARGV);
- }
- when ('apt-cache') {
- aptcmd('apt-cache', @ARGV);
- }
- when ('apt-file') {
- apt_file(@ARGV);
- }
- when ('apt-rdepends') {
- aptcmd('apt-rdepends', @ARGV);
- }
- when ('aptitude') {
- aptcmd('aptitude', @ARGV);
- }
- when ('bin2src') {
- bin2src(@ARGV);
- }
- when ('src2bin') {
- src2bin(@ARGV);
- }
- when ('compare-packages') {
- dist_compare(@ARGV, 0, 'Sources');
- }
- when ('compare-bin-packages') {
- dist_compare(@ARGV, 0, 'Packages');
- }
- when ('compare-versions') {
- dist_compare(@ARGV, 1, 'Sources');
- }
- when ('compare-bin-versions') {
- dist_compare(@ARGV, 1, 'Packages');
- }
- when ('grep-dctrl-packages') {
- grep_file(@ARGV, 'Packages');
- }
- when ('grep-dctrl-sources') {
- grep_file(@ARGV, 'Sources');
- }
- when ('compare-src-bin-packages') {
- compare_src_bin(@ARGV, 0);
- }
- when ('compare-src-bin-versions') {
- compare_src_bin(@ARGV, 1);
- }
- when ('list') {
- list;
- }
- default {
- my $dist = $command;
- my $dir = "$datadir/$dist";
- if (-d $dir && !$recursed) {
- splice @ARGV, 1, 0, $dist;
- $recursed = 1;
- goto MAIN;
- } elsif ($dist && !$recursed) {
- dist_check($dist);
- } else {
- usage(1);
- }
+if ($command eq 'create') {
+ dist_create(@ARGV);
+}
+elsif ($command eq 'apt') {
+ aptcmd('apt', @ARGV);
+}
+elsif ($command eq 'apt-get') {
+ aptcmd('apt-get', @ARGV);
+}
+elsif ($command eq 'apt-cache') {
+ aptcmd('apt-cache', @ARGV);
+}
+elsif ($command eq 'apt-file') {
+ apt_file(@ARGV);
+}
+elsif ($command eq 'apt-rdepends') {
+ aptcmd('apt-rdepends', @ARGV);
+}
+elsif ($command eq 'aptitude') {
+ aptcmd('aptitude', @ARGV);
+}
+elsif ($command eq 'bin2src') {
+ bin2src(@ARGV);
+}
+elsif ($command eq 'src2bin') {
+ src2bin(@ARGV);
+}
+elsif ($command eq 'compare-packages') {
+ dist_compare(@ARGV, 0, 'Sources');
+}
+elsif ($command eq 'compare-bin-packages') {
+ dist_compare(@ARGV, 0, 'Packages');
+}
+elsif ($command eq 'compare-versions') {
+ dist_compare(@ARGV, 1, 'Sources');
+}
+elsif ($command eq 'compare-bin-versions') {
+ dist_compare(@ARGV, 1, 'Packages');
+}
+elsif ($command eq 'grep-dctrl-packages') {
+ grep_file(@ARGV, 'Packages');
+}
+elsif ($command eq 'grep-dctrl-sources') {
+ grep_file(@ARGV, 'Sources');
+}
+elsif ($command eq 'compare-src-bin-packages') {
+ compare_src_bin(@ARGV, 0);
+}
+elsif ($command eq 'compare-src-bin-versions') {
+ compare_src_bin(@ARGV, 1);
+}
+elsif ($command eq 'list') {
+ list;
+}
+else {
+ my $dist = $command;
+ my $dir = "$datadir/$dist";
+ if (-d $dir && !$recursed) {
+ splice @ARGV, 1, 0, $dist;
+ $recursed = 1;
+ goto MAIN;
+ } elsif ($dist && !$recursed) {
+ dist_check($dist);
+ } else {
+ usage(1);
}
}
signature.asc
Description: PGP signature
