X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit;h=1877e03ec5d317675aa1cc0980bdd7da65dcf76c;hp=695f2b7ce9bd43210baee3236311c0a8c3574cea;hb=f1d68d5945334f10b96a94f129556656b1543dd8;hpb=a14c832fb36fa6ccccc8d8a02507983bec9adb52

diff --git a/dgit b/dgit
index 695f2b7c..1877e03e 100755
--- a/dgit
+++ b/dgit
@@ -20,6 +20,7 @@
 
 END { $? = $Debian::Dgit::ExitStatus::desired // -1; };
 use Debian::Dgit::ExitStatus;
+use Debian::Dgit::I18n;
 
 use strict;
 
@@ -37,6 +38,7 @@ use Dpkg::Version;
 use Dpkg::Compression;
 use Dpkg::Compression::Process;
 use POSIX;
+use Locale::gettext;
 use IPC::Open2;
 use Digest::SHA;
 use Digest::MD5;
@@ -113,7 +115,7 @@ our (@curl) = (qw(curl --proto-redir), '-all,http,https', qw(-L));
 our (@dput) = qw(dput);
 our (@debsign) = qw(debsign);
 our (@gpg) = qw(gpg);
-our (@sbuild) = qw(sbuild);
+our (@sbuild) = (qw(sbuild --no-source));
 our (@ssh) = 'ssh';
 our (@dgit) = qw(dgit);
 our (@git_debrebase) = qw(git-debrebase);
@@ -1472,10 +1474,11 @@ sub madison_get_parse {
 sub canonicalise_suite_madison {
     # madison canonicalises for us
     my @r = madison_get_parse(@_);
-    @r or fail
-	"unable to canonicalise suite using package $package".
-	" which does not appear to exist in suite $isuite;".
-	" --existing-package may help";
+    @r or fail f_
+	"unable to canonicalise suite using package %s".
+	" which does not appear to exist in suite %s;".
+	" --existing-package may help",
+	$package, $isuite;
     return $r[0][2];
 }
 
@@ -7190,7 +7193,7 @@ sub parseopts_late_defaults () {
 	$$vr = $v;
     }
 
-    fail "dgit: --include-dirty is not supported in split view quilt mode"
+    fail __ "dgit: --include-dirty is not supported in split view quilt mode"
 	if $split_brain && $includedirty;
 
     if (!defined $cleanmode) {
@@ -7208,6 +7211,9 @@ sub parseopts_late_defaults () {
     $bpd_glob =~ s#[][\\{}*?~]#\\$&#g;
 }
 
+setlocale(LC_MESSAGES, "");
+textdomain("dgit");
+
 if ($ENV{$fakeeditorenv}) {
     git_slurp_config();
     quilt_fixup_editor();