diff options
| -rwxr-xr-x | dgit | 59 |
1 files changed, 31 insertions, 28 deletions
@@ -4426,7 +4426,7 @@ END } elsif (deliberately_not_fast_forward) { $forceflag = '+'; } else { - fail "dgit push: HEAD is not a descendant". + fail __ "dgit push: HEAD is not a descendant". " of the archive's version.\n". "To overwrite the archive's contents,". " pass --overwrite[=VERSION].\n". @@ -4436,7 +4436,7 @@ END } changedir $playground; - progress "checking that $dscfn corresponds to HEAD"; + progress f_ "checking that %s corresponds to HEAD", $dscfn; runcmd qw(dpkg-source -x --), $dscpath =~ m#^/# ? $dscpath : "$maindir/$dscpath"; my ($tree,$dir) = mktree_in_ud_from_only_subdir("source package"); @@ -4469,27 +4469,27 @@ END } } if (@mode_changes) { - fail <<END.<<END -HEAD specifies a different tree to $dscfn: -END + fail +(f_ <<ENDT, $dscfn).<<END +HEAD specifies a different tree to %s: +ENDT $diffs END .(join '', @mode_changes) - .<<END; + .(f_ <<ENDT, $tree, $referent); There is a problem with your source tree (see dgit(7) for some hints). -To see a full diff, run git diff $tree $referent -END +To see a full diff, run git diff %s %s +ENDT } - fail <<END.<<END.<<END; -HEAD specifies a different tree to $dscfn: -END + fail +(f_ <<ENDT, $dscfn).<<END.(f_ <<ENDT, $tree, $referent); +HEAD specifies a different tree to %s: +ENDT $diffs END Perhaps you forgot to build. Or perhaps there is a problem with your source tree (see dgit(7) for some hints). To see a full diff, run - git diff $tree $referent -END + git diff %s %s +ENDT } else { failedcmd @diffcmd; } @@ -4497,9 +4497,10 @@ END if (!$changesfile) { my $pat = changespat $cversion; my @cs = glob "$buildproductsdir/$pat"; - fail "failed to find unique changes file". - " (looked for $pat in $buildproductsdir);". - " perhaps you need to use dgit -C" + fail f_ "failed to find unique changes file". + " (looked for %s in %s);". + " perhaps you need to use dgit -C", + $pat, $buildproductsdir unless @cs==1; ($changesfile) = @cs; } else { @@ -4518,21 +4519,23 @@ END if ($sourceonlypolicy eq 'ok') { } elsif ($sourceonlypolicy eq 'always') { forceable_fail [qw(uploading-binaries)], - "uploading binaries, although distroy policy is source only" + __ "uploading binaries, although distroy policy is source only" if $hasdebs; } elsif ($sourceonlypolicy eq 'never') { forceable_fail [qw(uploading-source-only)], - "source-only upload, although distroy policy requires .debs" + __ "source-only upload, although distroy policy requires .debs" if !$hasdebs; } elsif ($sourceonlypolicy eq 'not-wholly-new') { forceable_fail [qw(uploading-source-only)], - "source-only upload, even though package is entirely NEW\n". - "(this is contrary to policy in ".(access_nomdistro()).")" + f_ "source-only upload, even though package is entirely NEW\n". + "(this is contrary to policy in %s)", + access_nomdistro() if !$hasdebs && $new_package && !(archive_query('package_not_wholly_new', $package) // 1); } else { - badcfg "unknown source-only-uploads policy \`$sourceonlypolicy'"; + badcfg f_ "unknown source-only-uploads policy \`%s'", + $sourceonlypolicy; } # Perhaps adjust .dsc to contain right set of origs @@ -4574,7 +4577,7 @@ END dgit_privdir()."/tag"); my @tagobjfns; - supplementary_message(<<'END'); + supplementary_message(__ <<'END'); Push failed, while signing the tag. You can retry the push, after fixing the problem, if you like. END @@ -4587,7 +4590,7 @@ END $changesfile,$changesfile, \@tagwants); } - supplementary_message(<<'END'); + supplementary_message(__ <<'END'); Push failed, *after* signing the tag. If you want to try again, you should use a new version number. END @@ -4604,7 +4607,7 @@ END @git, qw(update-ref), "refs/tags/$tag", $tag_obj_hash; } - supplementary_message(<<'END'); + supplementary_message(__ <<'END'); Push failed, while updating the remote git repository - see messages above. If you want to try again, you should use a new version number. END @@ -4621,7 +4624,7 @@ END qw(-c push.followTags=false push), access_giturl(), @pushrefs; runcmd_ordryrun git_update_ref_cmd 'dgit push', lrref(), $dgithead; - supplementary_message(<<'END'); + supplementary_message(__ <<'END'); Push failed, while obtaining signatures on the .changes and .dsc. If it was just that the signature failed, you may try again by using debsign by hand to sign the changes file (see the command dgit tried, @@ -4638,15 +4641,15 @@ END if (act_local()) { rename "$dscpath.tmp",$dscpath or die "$dscfn $!"; } else { - progress "[new .dsc left in $dscpath.tmp]"; + progress f_ "[new .dsc left in %s.tmp]", $dscpath; } sign_changes $changesfile; } - supplementary_message(<<END); + supplementary_message(f_ <<END, $changesfile); Push failed, while uploading package(s) to the archive server. You can retry the upload of exactly these same files with dput of: - $changesfile + %s If that .changes file is broken, you will need to use a new version number for your next attempt at the upload. END |