diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-10-01 13:29:08 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-10-01 13:57:26 +0100 |
commit | ba30b66cfd502a20bf9c16b307f08862c5051b7a (patch) | |
tree | 722fc4b01b17b3ea3ed3f7ee4361571f0c5a73ec | |
parent | 0a87bee4083d73bf21ec70337f7fd098e523d6b5 (diff) |
i18n: dgit: mark some messages (7)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rwxr-xr-x | dgit | 60 |
1 files changed, 33 insertions, 27 deletions
@@ -5065,8 +5065,9 @@ sub i_resp_want ($) { pushing(); rpush_handle_protovsn_bothends(); - fail "rpush negotiated protocol version $protovsn". - " which does not support quilt mode $quilt_mode" + fail f_ "rpush negotiated protocol version %s". + " which does not support quilt mode %s", + $protovsn, $quilt_mode if quiltmode_splitbrain; my @localpaths = i_method "i_want", $keyword; @@ -5109,10 +5110,10 @@ sub i_file_buildinfo { if (!forceing [qw(buildinfo-changes-mismatch)]) { files_compare_inputs($bd, $ch); (getfield $bd, $_) eq (getfield $ch, $_) or - fail "buildinfo mismatch in field $_" + fail f_ "buildinfo mismatch in field %s", $_ foreach qw(Source Version); !defined $bd->{$_} or - fail "buildinfo contains forbidden field $_" + fail f_ "buildinfo contains forbidden field %s", $_ foreach qw(Changes Changed-by Distribution); } push @i_buildinfos, $bi; @@ -5153,7 +5154,7 @@ sub i_want_signed_tag { return push_mktags $i_clogp, $i_dscfn, - $i_changesfn, 'remote changes file', + $i_changesfn, (__ 'remote changes file'), \@tagwants; } @@ -5179,7 +5180,7 @@ sub quiltify_dpkg_commit ($$$;$) { mkpath '.git/dgit'; # we are in playtree my $descfn = ".git/dgit/quilt-description.tmp"; - open O, '>', $descfn or die "$descfn: $!"; + open O, '>', $descfn or confess "$descfn: $!"; $msg =~ s/\n+/\n\n/; print O <<END or die $!; From: $author @@ -5228,21 +5229,21 @@ sub quiltify_trees_differ ($$;$$$) { if ($unrepres) { eval { - die "not a plain file or symlink\n" + die __ "not a plain file or symlink\n" unless $newmode =~ m/^(?:10|12)\d{4}$/ || $oldmode =~ m/^(?:10|12)\d{4}$/; if ($oldmode =~ m/[^0]/ && $newmode =~ m/[^0]/) { # both old and new files exist - die "mode or type changed\n" if $oldmode ne $newmode; - die "modified symlink\n" unless $newmode =~ m/^10/; + die __ "mode or type changed\n" if $oldmode ne $newmode; + die __ "modified symlink\n" unless $newmode =~ m/^10/; } elsif ($oldmode =~ m/[^0]/) { # deletion - die "deletion of symlink\n" + die __ "deletion of symlink\n" unless $oldmode =~ m/^10/; } else { # creation - die "creation with non-default mode\n" + die __ "creation with non-default mode\n" unless $newmode =~ m/^100644$/ or $newmode =~ m/^120000$/; } @@ -5272,7 +5273,7 @@ sub quiltify_tree_sentinelfiles ($) { sub quiltify_splitbrain_needed () { if (!$split_brain) { - progress "dgit view: changes are required..."; + progress __ "dgit view: changes are required..."; runcmd @git, qw(checkout -q -b dgit-view); $split_brain = 1; } @@ -5301,32 +5302,34 @@ sub quiltify_splitbrain ($$$$$$$) { my ($x,$y) = @_; my $cmd = "git diff $x $y -- :/ ':!debian'"; $cmd .= " ':!/.gitignore' ':!*/.gitignore'" if $gitignore_special; - return "\nFor full diff showing the problem(s), type:\n $cmd\n"; + return f_ "\nFor full diff showing the problem(s), type:\n %s\n", + $cmd; }; if ($quilt_mode =~ m/gbp|unapplied/ && ($diffbits->{O2H} & 01)) { - my $msg = - "--quilt=$quilt_mode specified, implying patches-unapplied git tree\n". - " but git tree differs from orig in upstream files."; + my $msg = f_ + "--quilt=%s specified, implying patches-unapplied git tree\n". + " but git tree differs from orig in upstream files.", + $quilt_mode; $msg .= $fulldiffhint->($unapplied, 'HEAD'); if (!stat_exists "debian/patches") { - $msg .= + $msg .= __ "\n ... debian/patches is missing; perhaps this is a patch queue branch?"; } fail $msg; } if ($quilt_mode =~ m/dpm/ && ($diffbits->{H2A} & 01)) { - fail <<END. $fulldiffhint->($oldtiptree,'HEAD'); ---quilt=$quilt_mode specified, implying patches-applied git tree + fail +(f_ <<END, $quilt_mode). $fulldiffhint->($oldtiptree,'HEAD'); +--quilt=%s specified, implying patches-applied git tree but git tree differs from result of applying debian/patches to upstream END } if ($quilt_mode =~ m/gbp|unapplied/ && ($diffbits->{O2A} & 01)) { # some patches quiltify_splitbrain_needed(); - progress "dgit view: creating patches-applied version using gbp pq"; + progress __ "dgit view: creating patches-applied version using gbp pq"; runcmd shell_cmd 'exec >/dev/null', gbp_pq, qw(import); # gbp pq import creates a fresh branch; push back to dgit-view runcmd @git, qw(update-ref refs/heads/dgit-view HEAD); @@ -5334,8 +5337,8 @@ END } if ($quilt_mode =~ m/gbp|dpm/ && ($diffbits->{O2A} & 02)) { - fail <<END; ---quilt=$quilt_mode specified, implying that HEAD is for use with a + fail f_ <<END, $quilt_mode; +--quilt=%s specified, implying that HEAD is for use with a tool which does not create patches for changes to upstream .gitignores: but, such patches exist in debian/patches. END @@ -5343,13 +5346,16 @@ END if (($diffbits->{O2H} & 02) && # user has modified .gitignore !($diffbits->{O2A} & 02)) { # patches do not change .gitignore quiltify_splitbrain_needed(); - progress "dgit view: creating patch to represent .gitignore changes"; + progress __ + "dgit view: creating patch to represent .gitignore changes"; ensuredir "debian/patches"; my $gipatch = "debian/patches/auto-gitignore"; - open GIPATCH, ">>", "$gipatch" or die "$gipatch: $!"; - stat GIPATCH or die "$gipatch: $!"; - fail "$gipatch already exists; but want to create it". - " to record .gitignore changes" if (stat _)[7]; + open GIPATCH, ">>", "$gipatch" or confess "$gipatch: $!"; + stat GIPATCH or confess "$gipatch: $!"; + fail f_ "%s already exists; but want to create it". + " to record .gitignore changes", + $gipatch + if (stat _)[7]; print GIPATCH <<END or die "$gipatch: $!"; Subject: Update .gitignore from Debian packaging branch |