Bug#871657: dch: please add --sru option

Antoine Beaupré anarcat at orangeseeds.org
Mon Oct 23 21:36:50 UTC 2017


On 2017-10-23 22:31:43, Chris Lamb wrote:
> Hi Antoine et al.,
>
>> Those two chunks, in particular, probably do not yield the warning you
>> would have expected:
> […]
>> ... because they do not actually change the conditionnals!
>
> Can you clarify and/or provide an updated patch? I think I'm being
> blind or am over/under-caffeinated..
>
> Would be great to have both --sru and --lts merged! :)

Something like this maybe?

diff --git a/scripts/debchange.pl b/scripts/debchange.pl
index 27915460..57db5606 100755
--- a/scripts/debchange.pl
+++ b/scripts/debchange.pl
@@ -437,7 +437,7 @@ ()
 
 # Only allow at most one non-help option
 fatal "Only one of -a, -i, -e, -r, -v, -d, -n/--nmu, --bin-nmu, -q/--qa, -R/--rebuild, -s/--security, --lts, --team, --bpo, --stable, -l/--local is allowed;\ntry $progname --help for more help"
-    if ($opt_i?1:0) + ($opt_a?1:0) + ($opt_e?1:0) + ($opt_r?1:0) + ($opt_v?1:0) + ($opt_d?1:0) + ($opt_n?1:0) + ($opt_bn?1:0) + ($opt_qa?1:0) + ($opt_R?1:0) + ($opt_s?1:0) + ($opt_lts?1:0) + ($opt_team?1:0) + ($opt_bpo?1:0) + ($opt_l?1:0) > 1;
+    if ($opt_i?1:0) + ($opt_a?1:0) + ($opt_e?1:0) + ($opt_r?1:0) + ($opt_v?1:0) + ($opt_d?1:0) + ($opt_n?1:0) + ($opt_bn?1:0) + ($opt_qa?1:0) + ($opt_R?1:0) + ($opt_s?1:0) + ($opt_lts?1:0) + ($opt_team?1:0) + ($opt_bpo?1:0) + ($opt_l?1:0) + ($opt_stable?1:0)> 1;
 
 if ($opt_s) {
     $opt_u = "high";
@@ -547,7 +547,7 @@ ()
 if ($opt_create) {
     if ($opt_a || $opt_i || $opt_e || $opt_r || $opt_b || $opt_n || $opt_bn ||
            $opt_qa || $opt_R || $opt_s || $opt_team || $opt_lts || $opt_bpo || $opt_l ||
-           $opt_allow_lower) {
+           $opt_allow_lower || $opt_stable) {
        warn "$progname warning: ignoring -a/-i/-e/-r/-b/--allow-lower-version/-n/--bin-nmu/-q/--qa/-R/-s/--lts/--team/--bpo/--stable,-l options with --create\n";
        $warnings++;
     }



-- 
Power is always dangerous.
Power attracts the worst and corrupts the best.
                        - Edward Abbey



More information about the devscripts-devel mailing list