diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-10-01 14:36:45 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-10-01 14:54:44 +0100 |
commit | 18c41ad7f852905ddf59eede58d0697390d0b36a (patch) | |
tree | 2d4fbf563cd8fb0bee4cb1972d3b7b21be87e342 /dgit | |
parent | 872b83f4cd6b6293b6f5e4330b6be8b7578b5b89 (diff) |
i18n: dgit: mark some messages (10)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'dgit')
-rwxr-xr-x | dgit | 167 |
1 files changed, 93 insertions, 74 deletions
@@ -6149,7 +6149,7 @@ sub quilt_fixup_editor () { sub maybe_apply_patches_dirtily () { return unless $quilt_mode =~ m/gbp|unapplied/; - print STDERR <<END or confess $!; + print STDERR __ <<END or confess $!; dgit: Building, or cleaning with rules target, in patches-unapplied tree. dgit: Have to apply the patches - making the tree dirty. @@ -6162,7 +6162,7 @@ END } sub maybe_unapply_patches_again () { - progress "dgit: Unapplying patches again to tidy up the tree." + progress __ "dgit: Unapplying patches again to tidy up the tree." if $patches_applied_dirtily; runcmd qw(dpkg-source --after-build .) if $patches_applied_dirtily & 01; @@ -6195,7 +6195,8 @@ sub clean_tree () { my $leftovers = cmdoutput @git, qw(clean -xdn); if (length $leftovers) { print STDERR $leftovers, "\n" or confess $!; - fail "tree contains uncommitted files and --clean=check specified"; + fail __ + "tree contains uncommitted files and --clean=check specified"; } } elsif ($cleanmode eq 'none') { } else { @@ -6204,7 +6205,7 @@ sub clean_tree () { } sub cmd_clean () { - badusage "clean takes no additional arguments" if @ARGV; + badusage __ "clean takes no additional arguments" if @ARGV; notpushing(); clean_tree(); maybe_unapply_patches_again(); @@ -6217,7 +6218,8 @@ sub WANTSRC_BUILDER () { 02; } # caller should run dpkg-buildpackage sub build_or_push_prep_early () { our $build_or_push_prep_early_done //= 0; return if $build_or_push_prep_early_done++; - badusage "-p is not allowed with dgit $subcommand" if defined $package; + badusage f_ "-p is not allowed with dgit %s", $subcommand + if defined $package; my $clogp = parsechangelog(); $isuite = getfield $clogp, 'Distribution'; $package = getfield $clogp, 'Source'; @@ -6242,9 +6244,10 @@ sub build_prep ($) { my $pat = changespat $version; foreach my $f (glob "$buildproductsdir/$pat") { if (act_local()) { - unlink $f or fail "remove old changes file $f: $!"; + unlink $f or + fail f_ "remove old changes file %s: %s", $f, $!; } else { - progress "would remove $f"; + progress f_ "would remove %s", $f; } } } @@ -6269,17 +6272,17 @@ sub changesopts_version () { 1; }) { print STDERR $@; - fail + fail __ "archive query failed (queried because --since-version not specified)"; } if (@vsns) { @vsns = map { $_->[0] } @vsns; @vsns = sort { -version_compare($a, $b) } @vsns; $changes_since_version = $vsns[0]; - progress "changelog will contain changes since $vsns[0]"; + progress f_ "changelog will contain changes since %s", $vsns[0]; } else { $changes_since_version = '_'; - progress "package seems new, not specifying -v<version>"; + progress __ "package seems new, not specifying -v<version>"; } } if ($changes_since_version ne '_') { @@ -6322,14 +6325,14 @@ sub massage_dbp_args ($;$) { $r |= WANTSRC_SOURCE if grep { s/^full$/binary/ } @d; $r |= WANTSRC_SOURCE if grep { s/^source$// } @d; $r |= WANTSRC_BUILDER if grep { m/./ } @d; - fail "Wanted to build nothing!" unless $r; + fail __ "Wanted to build nothing!" unless $r; $dmode = '--build='. join ',', grep m/./, @d; } else { $r = $dmode =~ m/[S]/ ? WANTSRC_SOURCE : $dmode =~ y/gGF/ABb/ ? WANTSRC_SOURCE | WANTSRC_BUILDER : $dmode =~ m/[ABb]/ ? WANTSRC_BUILDER : - die "$dmode ?"; + confess "$dmode ?"; } printdebug "massage done $r $dmode.\n"; push @$cmd, $dmode; @@ -6359,32 +6362,35 @@ sub postbuild_mergechanges ($) { } @changesfiles; my $result; if (@changesfiles==1) { - fail <<END.$msg_if_onlyone if defined $msg_if_onlyone; -only one changes file from build (@changesfiles) + fail +(f_ <<END, "@changesfiles").$msg_if_onlyone +only one changes file from build (%s) END + if defined $msg_if_onlyone; $result = $changesfiles[0]; } elsif (@changesfiles==2) { my $binchanges = parsecontrol($changesfiles[1], "binary changes file"); foreach my $l (split /\n/, getfield $binchanges, 'Files') { - fail "$l found in binaries changes file $binchanges" + fail f_ "%s found in binaries changes file %s", $l, $binchanges if $l =~ m/\.dsc$/; } runcmd_ordryrun_local @mergechanges, @changesfiles; my $multichanges = changespat $version,'multi'; if (act_local()) { - stat_exists $multichanges - or fail "$multichanges unexpectedly not created by build"; + stat_exists $multichanges or fail f_ + "%s unexpectedly not created by build", $multichanges; foreach my $cf (glob $pat) { next if $cf eq $multichanges; - rename "$cf", "$cf.inmulti" or - fail "install new changes $cf\{,.inmulti}: $!"; + rename "$cf", "$cf.inmulti" or fail f_ + "install new changes %s\{,.inmulti}: %s", $cf, $!; } } $result = $multichanges; } else { - fail "wrong number of different changes files (@changesfiles)"; + fail f_ "wrong number of different changes files (%s)", + "@changesfiles"; } - printdone "build successful, results in $result\n" or confess $!; + printdone f_ "build successful, results in %s\n", $result + or confess $!; } sub midbuild_checkchanges () { @@ -6395,9 +6401,9 @@ sub midbuild_checkchanges () { $_ ne changespat $version,'source' and $_ ne changespat $version,'multi' } @unwanted; - fail <<END -changes files other than source matching $pat already present; building would result in ambiguity about the intended results. -Suggest you delete @unwanted. + fail +(f_ <<END, $pat, "@unwanted") +changes files other than source matching %s already present; building would result in ambiguity about the intended results. +Suggest you delete %s. END if @unwanted; } @@ -6414,15 +6420,15 @@ sub postbuild_mergechanges_vanilla ($) { postbuild_mergechanges(undef); }; } else { - printdone "build successful\n"; + printdone __ "build successful\n"; } } sub cmd_build { build_prep_early(); - $buildproductsdir eq '..' or print STDERR <<END; -$us: warning: build-products-dir set, but not supported by dpkg-buildpackage -$us: warning: build-products-dir will be ignored; files will go to .. + $buildproductsdir eq '..' or print STDERR +(f_ <<END, $us, $us); +%s: warning: build-products-dir set, but not supported by dpkg-buildpackage +%s: warning: build-products-dir will be ignored; files will go to .. END $buildproductsdir = '..'; my @dbp = (@dpkgbuildpackage, qw(-us -uc), changesopts_initial(), @ARGV); @@ -6533,7 +6539,7 @@ sub build_source { $sourcechanges = changespat $version,'source'; if (act_local()) { unlink "$buildproductsdir/$sourcechanges" or $!==ENOENT - or fail "remove $sourcechanges: $!"; + or fail f_ "remove %s: %s", $sourcechanges, $!; } my @cmd = (@dpkgsource, qw(-b --)); my $leafdir; @@ -6570,7 +6576,7 @@ sub build_source { my ($why, $l) = @_; printdebug " renaming ($why) $l\n"; rename "$l", bpd_abs()."/$l" - or fail "put in place new built file ($l): $!"; + or fail f_ "put in place new built file (%s): %s", $l, $!; }; foreach my $l (split /\n/, getfield $dsc, 'Files') { $l =~ m/\S+$/ or next; @@ -6583,28 +6589,31 @@ sub build_source { } sub cmd_build_source { - badusage "build-source takes no additional arguments" if @ARGV; + badusage __ "build-source takes no additional arguments" if @ARGV; build_prep(WANTSRC_SOURCE); build_source(); maybe_unapply_patches_again(); - printdone "source built, results in $dscfn and $sourcechanges"; + printdone f_ "source built, results in %s and %s", + $dscfn, $sourcechanges; } sub cmd_push_source { prep_push(); - fail "dgit push-source: --include-dirty/--ignore-dirty does not make". - "sense with push-source!" if $includedirty; + fail __ + "dgit push-source: --include-dirty/--ignore-dirty does not make". + "sense with push-source!" + if $includedirty; build_maybe_quilt_fixup(); if ($changesfile) { my $changes = parsecontrol("$buildproductsdir/$changesfile", - "source changes file"); + __ "source changes file"); unless (test_source_only_changes($changes)) { - fail "user-specified changes file is not source-only"; + fail __ "user-specified changes file is not source-only"; } } else { # Building a source package is very fast, so just do it build_source(); - die "er, patches are applied dirtily but shouldn't be.." + confess "er, patches are applied dirtily but shouldn't be.." if $patches_applied_dirtily; $changesfile = $sourcechanges; } @@ -6618,9 +6627,10 @@ sub binary_builder { midbuild_checkchanges(); in_bpd { if (act_local()) { - stat_exists $dscfn or fail "$dscfn (in build products dir): $!"; - stat_exists $sourcechanges - or fail "$sourcechanges (in build products dir): $!"; + stat_exists $dscfn or fail f_ + "%s (in build products dir): %s", $dscfn, $!; + stat_exists $sourcechanges or fail f_ + "%s (in build products dir): %s", $sourcechanges, $!; } runcmd_ordryrun_local @$bbuilder, @args; }; @@ -6632,7 +6642,7 @@ sub binary_builder { sub cmd_sbuild { build_prep_early(); - binary_builder(\@sbuild, <<END, qw(-d), $isuite, @ARGV, $dscfn); + binary_builder(\@sbuild, (__ <<END), qw(-d), $isuite, @ARGV, $dscfn); perhaps you need to pass -A ? (sbuild's default is to build only arch-specific binaries; dgit 1.4 used to override that.) END @@ -6644,11 +6654,13 @@ sub pbuilder ($) { # @ARGV is allowed to contain only things that should be passed to # pbuilder under debbuildopts; just massage those my $wantsrc = massage_dbp_args \@ARGV; - fail "you asked for a builder but your debbuildopts didn't ask for". - " any binaries -- is this really what you meant?" - unless $wantsrc & WANTSRC_BUILDER; - fail "we must build a .dsc to pass to the builder but your debbuiltopts". - " forbids the building of a source package; cannot continue" + fail __ + "you asked for a builder but your debbuildopts didn't ask for". + " any binaries -- is this really what you meant?" + unless $wantsrc & WANTSRC_BUILDER; + fail __ + "we must build a .dsc to pass to the builder but your debbuiltopts". + " forbids the building of a source package; cannot continue" unless $wantsrc & WANTSRC_SOURCE; # We do not want to include the verb "build" in @pbuilder because # the user can customise @pbuilder and they shouldn't be required @@ -6677,7 +6689,8 @@ sub cmd_quilt_fixup { } sub cmd_print_unapplied_treeish { - badusage "incorrect arguments to dgit print-unapplied-treeish" if @ARGV; + badusage __ "incorrect arguments to dgit print-unapplied-treeish" + if @ARGV; my $headref = git_rev_parse('HEAD'); my $clogp = commit_getclogp $headref; $package = getfield $clogp, 'Source'; @@ -6698,9 +6711,9 @@ sub import_dsc_result { my ($dstref, $newhash, $what_log, $what_msg) = @_; my @cmd = (git_update_ref_cmd $what_log, $dstref, $newhash); runcmd @cmd; - check_gitattrs($newhash, "source tree"); + check_gitattrs($newhash, __ "source tree"); - progress "dgit: import-dsc: $what_msg"; + progress f_ "dgit: import-dsc: %s", $what_msg; } sub cmd_import_dsc { @@ -6713,14 +6726,16 @@ sub cmd_import_dsc { if (m/^--require-valid-signature$/) { $needsig = 1; } else { - badusage "unknown dgit import-dsc sub-option \`$_'"; + badusage f_ "unknown dgit import-dsc sub-option \`%s'", $_; } } - badusage "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH" unless @ARGV==2; + badusage __ "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH" + unless @ARGV==2; my ($dscfn, $dstbranch) = @ARGV; - badusage "dry run makes no sense with import-dsc" unless act_local(); + badusage __ "dry run makes no sense with import-dsc" + unless act_local(); my $force = $dstbranch =~ s/^\+// ? +1 : $dstbranch =~ s/^\.\.// ? -1 : @@ -6736,14 +6751,14 @@ sub cmd_import_dsc { my $chead = cmdoutput_errok @symcmd; defined $chead or $?==256 or failedcmd @symcmd; - fail "$dstbranch is checked out - will not update it" + fail f_ "%s is checked out - will not update it", $dstbranch if defined $chead and $chead eq $dstbranch; my $oldhash = git_get_ref $dstbranch; - open D, "<", $dscfn or fail "open import .dsc ($dscfn): $!"; + open D, "<", $dscfn or fail f_ "open import .dsc (%s): %s", $dscfn, $!; $dscdata = do { local $/ = undef; <D>; }; - D->error and fail "read $dscfn: $!"; + D->error and fail f_ "read %s: %s", $dscfn, $!; close C; # we don't normally need this so import it here @@ -6754,13 +6769,13 @@ sub cmd_import_dsc { local $SIG{__WARN__} = sub { print STDERR $_[0]; return unless $needsig; - fail "import-dsc signature check failed"; + fail __ "import-dsc signature check failed"; }; if (!$dp->is_signed()) { - warn "$us: warning: importing unsigned .dsc\n"; + warn f_ "%s: warning: importing unsigned .dsc\n", $us; } else { my $r = $dp->check_signature(); - die "->check_signature => $r" if $needsig && $r; + confess "->check_signature => $r" if $needsig && $r; } } @@ -6768,7 +6783,7 @@ sub cmd_import_dsc { $package = getfield $dsc, 'Source'; - parse_dsc_field($dsc, "Dgit metadata in .dsc") + parse_dsc_field($dsc, __ "Dgit metadata in .dsc") unless forceing [qw(import-dsc-with-dgit-field)]; parse_dsc_field_def_dsc_distro(); @@ -6778,7 +6793,8 @@ sub cmd_import_dsc { notpushing(); if (defined $dsc_hash) { - progress "dgit: import-dsc of .dsc with Dgit field, using git hash"; + progress __ + "dgit: import-dsc of .dsc with Dgit field, using git hash"; resolve_dsc_field_commit undef, undef; } if (defined $dsc_hash) { @@ -6786,29 +6802,29 @@ sub cmd_import_dsc { "echo $dsc_hash | git cat-file --batch-check"); my $objgot = cmdoutput @cmd; if ($objgot =~ m#^\w+ missing\b#) { - fail <<END -.dsc contains Dgit field referring to object $dsc_hash + fail f_ <<END, $dsc_hash +.dsc contains Dgit field referring to object %s Your git tree does not have that object. Try `git fetch' from a plausible server (browse.dgit.d.o? alioth?), and try the import-dsc again. END } if ($oldhash && !is_fast_fwd $oldhash, $dsc_hash) { if ($force > 0) { - progress "Not fast forward, forced update."; + progress __ "Not fast forward, forced update."; } else { - fail "Not fast forward to $dsc_hash"; + fail f_ "Not fast forward to %s", $dsc_hash; } } import_dsc_result $dstbranch, $dsc_hash, "dgit import-dsc (Dgit): $info", - "updated git ref $dstbranch"; + f_ "updated git ref %s", $dstbranch; return 0; } - fail <<END -Branch $dstbranch already exists -Specify ..$specbranch for a pseudo-merge, binding in existing history -Specify +$specbranch to overwrite, discarding existing history + fail f_ <<END, $dstbranch, $specbranch, $specbranch +Branch %s already exists +Specify ..%s for a pseudo-merge, binding in existing history +Specify +%s to overwrite, discarding existing history END if $oldhash && !$force; @@ -6818,19 +6834,22 @@ END my $here = "$buildproductsdir/$f"; if (lstat $here) { next if stat $here; - fail "lstat $here works but stat gives $! !"; + fail f_ "lstat %s works but stat gives %s !", $here, $!; } - fail "stat $here: $!" unless $! == ENOENT; + fail f_ "stat %s: %s", $here, $! unless $! == ENOENT; my $there = $dscfn; if ($dscfn =~ m#^(?:\./+)?\.\./+#) { $there = $'; } elsif ($dscfn =~ m#^/#) { $there = $dscfn; } else { - fail "cannot import $dscfn which seems to be inside working tree!"; + fail f_ + "cannot import %s which seems to be inside working tree!", + $dscfn; } - $there =~ s#/+[^/]+$## or - fail "import $dscfn requires ../$f, but it does not exist"; + $there =~ s#/+[^/]+$## or fail f_ + "import %s requires ../%s, but it does not exist", + $dscfn, $f; $there .= "/$f"; my $test = $there =~ m{^/} ? $there : "../$there"; stat $test or fail "import $dscfn requires $test, but: $!"; |