Commit 0ea97311 authored by Ian Jackson's avatar Ian Jackson

i18n: Dgit.pm: mark final batch of messages (2)

Signed-off-by: Ian Jackson's avatarIan Jackson <ijackson@chiark.greenend.org.uk>
parent 7888f1af
......@@ -541,8 +541,8 @@ sub git_check_unmodified () {
if ($?==256) {
fail
$cached
? "git index contains changes (does not match HEAD)"
: "working tree is dirty (does not match HEAD)";
? __ "git index contains changes (does not match HEAD)"
: __ "working tree is dirty (does not match HEAD)";
} else {
failedcmd @cmd;
}
......@@ -613,8 +613,8 @@ sub gdr_ffq_prev_branchinfo ($) {
# branch message is undef
# weird-symref } no $symref,
# notbranch } no $ffq_prev
return ('detached', 'detached HEAD') unless defined $symref;
return ('weird-symref', 'HEAD symref is not to refs/')
return ('detached', __ 'detached HEAD') unless defined $symref;
return ('weird-symref', __ 'HEAD symref is not to refs/')
unless $symref =~ m{^refs/};
my $ffq_prev = "refs/$ffq_refprefix/$'";
my $gdrlast = "refs/$gdrlast_refprefix/$'";
......@@ -630,7 +630,7 @@ sub parsecontrolfh ($$;$) {
my %opts = ('name' => $desc);
$opts{allow_pgp}= $allowsigned || !$dpkgcontrolhash_noissigned;
$c = Dpkg::Control::Hash->new(%opts);
$c->parse($fh,$desc) or fail "parsing of $desc failed";
$c->parse($fh,$desc) or fail f_ "parsing of %s failed", $desc;
last if $allowsigned;
last if $dpkgcontrolhash_noissigned;
my $issigned= $c->get_option('is_pgp_signed');
......@@ -638,9 +638,11 @@ sub parsecontrolfh ($$;$) {
$dpkgcontrolhash_noissigned= 1;
seek $fh, 0,0 or confess "seek $desc: $!";
} elsif ($issigned) {
fail "control file $desc is (already) PGP-signed. ".
fail f_
"control file %s is (already) PGP-signed. ".
" Note that dgit push needs to modify the .dsc and then".
" do the signature itself";
" do the signature itself",
$desc;
} else {
last;
}
......@@ -651,7 +653,7 @@ sub parsecontrolfh ($$;$) {
sub parsecontrol {
my ($file, $desc, $allowsigned) = @_;
my $fh = new IO::Handle;
open $fh, '<', $file or fail "open $file ($desc): $!";
open $fh, '<', $file or fail f_ "open %s (%s): %s", $file, $desc, $!;
my $c = parsecontrolfh($fh,$desc,$allowsigned);
$fh->error and confess $!;
close $fh;
......@@ -737,7 +739,7 @@ sub reflog_cache_insert ($$$) {
# git update-ref doesn't always update, in this case. *sigh*
my $authline = (ucfirst _us()).
' <'._us().'@example.com> 1000000000 +0000';
my $dummy = make_commit_text <<ENDU.<<END;
my $dummy = make_commit_text <<ENDU.(__ <<END);
tree $tree
parent $value
author $authline
......@@ -833,7 +835,7 @@ sub record_maindir () {
if (!defined $maindir) {
$maindir = must_getcwd();
if (!stat "$maindir/.git") {
fail "cannot stat $maindir/.git: $!";
fail f_ "cannot stat %s/.git: %s", $maindir, $!;
}
if (-d _) {
# we fall back to this in case we have a pre-worktree
......@@ -855,15 +857,16 @@ sub ensure_a_playground_parent ($) {
record_maindir();
$spc = "$maindir_gitdir/$spc";
my $parent = dirname $spc;
mkdir $parent or $!==EEXIST
or fail "failed to mkdir playground parent $parent: $!";
mkdir $parent or $!==EEXIST or fail f_
"failed to mkdir playground parent %s: %s", $parent, $!;
return $spc;
}
sub ensure_a_playground ($) {
my ($spc) = @_;
$spc = ensure_a_playground_parent $spc;
mkdir $spc or $!==EEXIST or fail "failed to mkdir a playground $spc: $!";
mkdir $spc or $!==EEXIST or fail f_
"failed to mkdir a playground %s: %s", $spc, $!;
return $spc;
}
......@@ -871,7 +874,8 @@ sub fresh_playground ($) {
my ($spc) = @_;
$spc = ensure_a_playground_parent $spc;
rmtree $spc;
mkdir $spc or fail "failed to mkdir the playground $spc: $!";
mkdir $spc or fail f_
"failed to mkdir the playground %s: %s", $spc, $!;
return $spc;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment