implement apt-get source msg 'Please use: $vcs' for git

A bit unfair that only Bzr had this message. Lets at least print it for
git as well with the option of adding more later without string changes.

46 files changed, 101 insertions, 113 deletions

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index ebc8c94c2..cef7d8c14 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -78,7 +78,6 @@
 #include <string.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
-#include <sys/wait.h>
 #include <unistd.h>
 #include <pwd.h>
 #include <grp.h>
@@ -738,17 +737,22 @@ static bool DoSource(CommandLine &CmdL)
 	 }
 	 pos += vcs.length()+2;
 	 string::size_type epos = srec.find("\n", pos);
-	 string uri = srec.substr(pos,epos-pos).c_str();
+	 string const uri = srec.substr(pos,epos-pos);
 	 ioprintf(c1out, _("NOTICE: '%s' packaging is maintained in "
 			   "the '%s' version control system at:\n"
 			   "%s\n"),
 		  Src.c_str(), vcs.c_str(), uri.c_str());
-	 if(vcs == "Bzr") 
-	    ioprintf(c1out,_("Please use:\n"
-			     "bzr branch %s\n"
-			     "to retrieve the latest (possibly unreleased) "
-			     "updates to the package.\n"),
-		     uri.c_str());
+	 std::string vcscmd;
+	 if (vcs == "Bzr")
+	    vcscmd = "bzr branch " + uri;
+	 else if (vcs == "Git")
+	    vcscmd = "git clone " + uri;
+
+	 if (vcscmd.empty() == false)
+	    ioprintf(c1out,_("Please use:\n%s\n"
+		     "to retrieve the latest (possibly unreleased) "
+		     "updates to the package.\n"),
+		  vcscmd.c_str());
 	 break;
       }
 
@@ -936,19 +940,7 @@ static bool DoSource(CommandLine &CmdL)
       _exit(0);
    }
 
-   // Wait for the subprocess
-   int Status = 0;
-   while (waitpid(Process,&Status,0) != Process)
-   {
-      if (errno == EINTR)
-	 continue;
-      return _error->Errno("waitpid","Couldn't wait for subprocess");
-   }
-
-   if (WIFEXITED(Status) == 0 || WEXITSTATUS(Status) != 0)
-      return _error->Error(_("Child process failed"));
-   
-   return true;
+   return ExecWait(Process, "dpkg-source");
 }
 									/*}}}*/
 // DoBuildDep - Install/removes packages to satisfy build dependencies  /*{{{*/
diff --git a/po/apt-all.pot b/po/apt-all.pot
index d241d6f1a..9074ec72b 100644
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -315,8 +315,7 @@ msgstr ""
 #: cmdline/apt-get.cc:747
 #, c-format
 msgid ""
-"Please use:\n"
-"bzr branch %s\n"
+"Please use:\n%s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
diff --git a/po/ar.po b/po/ar.po
index 66ef5c545..ccf1916d8 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -325,8 +325,7 @@ msgstr ""
 #: cmdline/apt-get.cc:747
 #, c-format
 msgid ""
-"Please use:\n"
-"bzr branch %s\n"
+"Please use:\n%s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
diff --git a/po/ast.po b/po/ast.po
index 355a48f60..31aabfdc0 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -370,8 +370,7 @@ msgstr ""
 #: cmdline/apt-get.cc:747
 #, fuzzy, c-format
 msgid ""
-"Please use:\n"
-"bzr branch %s\n"
+"Please use:\n%s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 "Por favor, usa:\n"
diff --git a/po/bg.po b/po/bg.po
index fe4e01131..a58082a74 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -375,12 +375,10 @@ msgstr ""
 #: cmdline/apt-get.cc:747
 #, c-format
 msgid ""
-"Please use:\n"
-"bzr branch %s\n"
+"Please use:\n%s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
-"Използвайте:\n"
-"bzr branch %s\n"
+"Използвайте:\n%s\n"
 "за да изтеглите последните промени в пакета (евентуално в процес на "
 "разработка).\n"
 
diff --git a/po/bs.po b/po/bs.po
index 4641443b2..e956259e2 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -331,8 +331,7 @@ msgstr ""
 #: cmdline/apt-get.cc:747
 #, c-format
 msgid ""
-"Please use:\n"
-"bzr branch %s\n"
+"Please use:\n%s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
diff --git a/po/ca.po b/po/ca.po
index b1d0841f6..ec59c5b40 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -376,12 +376,10 @@ msgstr ""
 #: cmdline/apt-get.cc:747
 #, c-format
 msgid ""
-"Please use:\n"
-"bzr branch %s\n"
+"Please use:\n%s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
-"Empreu:\n"
-"bzr branch %s\n"
+"Empreu:\n%s\n"
 "per obtenir les últimes actualitzacions (possiblement no publicades) del "
 "paquet.\n"
 
diff --git a/po/cs.po b/po/cs.po
index 27f41486a..3c6b7639a 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -367,13 +367,11 @@ msgstr ""
 #: cmdline/apt-get.cc:747
 #, c-format
 msgid ""
-"Please use:\n"
-"bzr branch %s\n"
+"Please use:\n%s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 "Pro stažení nejnovějších (možná dosud nevydaných) aktualizací balíku prosím "
-"použijte:\n"
-"bzr branch %s\n"
+"použijte:\n%s\n"
 
 #: cmdline/apt-get.cc:795
 #, c-format
diff --git a/po/cy.po b/po/cy.po
index e3eb9baf0..c4ebfd0d1 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -389,8 +389,7 @@ msgstr ""
 #: cmdline/apt-get.cc:747
 #, c-format
 msgid ""
-"Please use:\n"
-"bzr branch %s\n"
+"Please use:\n%s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
diff --git a/po/da.po b/po/da.po
index 2672994b0..86db650c0 100644
--- a/po/da.po
+++ b/po/da.po
@@ -378,12 +378,10 @@ msgstr ""
 #: cmdline/apt-get.cc:747
 #, c-format
 msgid ""
-"Please use:\n"
-"bzr branch %s\n"
+"Please use:\n%s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
-"Brug venligst:\n"
-"bzr branch %s\n"
+"Brug venligst:\n%s\n"
 "for at hente de seneste (muligvis ikke udgivet) opdateringer til pakken.\n"
 
 #: cmdline/apt-get.cc:795
diff --git a/po/de.po b/po/de.po
index fdfabac1a..a40d08c14 100644
--- a/po/de.po
+++ b/po/de.po
@@ -391,12 +391,10 @@ msgstr ""
 #: cmdline/apt-get.cc:747
 #, c-format
 msgid ""
-"Please use:\n"
-"bzr branch %s\n"
+"Please use:\n%s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
-"Bitte verwenden Sie:\n"
-"bzr branch %s\n"
+"Bitte verwenden Sie:\n%s\n"
 "um die neuesten (möglicherweise noch unveröffentlichten) Aktualisierungen\n"
 "für das Paket abzurufen.\n"
 
diff --git a/po/dz.po b/po/dz.po
index 2b697175a..97c41973f 100644
--- a/po/dz.po
+++ b/po/dz.po
@@ -376,8 +376,7 @@ msgstr ""
 #: cmdline/apt-get.cc:747
 #, c-format
 msgid ""
-"Please use:\n"
-"bzr branch %s\n"
+"Please use:\n%s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
diff --git a/po/el.po b/po/el.po
index 2a66769e4..04ceb86c4 100644
--- a/po/el.po
+++ b/po/el.po
@@ -385,8 +385,7 @@ msgstr ""
 #: cmdline/apt-get.cc:747
 #, c-format
 msgid ""
-"Please use:\n"
-"bzr branch %s\n"
+"Please use:\n%s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
diff --git a/po/es.po b/po/es.po
index a0cf24636..05a5c9b34 100644
--- a/po/es.po
+++ b/po/es.po
@@ -440,12 +440,10 @@ msgstr ""
 #: cmdline/apt-get.cc:747
 #, c-format
 msgid ""
-"Please use:\n"
-"bzr branch %s\n"
+"Please use:\n%s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
-"Utilice:\n"
-"bzr branch %s\n"
+"Utilice:\n%s\n"
 "para obtener las últimas actualizaciones (posiblemente no publicadas aún) "
 "del paquete.\n"
 
diff --git a/po/eu.po b/po/eu.po
index 285b96c60..d5e3f1c00 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -372,8 +372,7 @@ msgstr ""
 #: cmdline/apt-get.cc:747
 #, c-format
 msgid ""
-"Please use:\n"
-"bzr branch %s\n"
+"Please use:\n%s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
diff --git a/po/fi.po b/po/fi.po
index bf8d9a98a..e14a546fc 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -369,8 +369,7 @@ msgstr ""
 #: cmdline/apt-get.cc:747
 #, c-format
 msgid ""
-"Please use:\n"
-"bzr branch %s\n"
+"Please use:\n%s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
diff --git a/po/fr.po b/po/fr.po
index 00e259aa3..fbc411cdf 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -388,12 +388,10 @@ msgstr ""
 #: cmdline/apt-get.cc:747
 #, c-format
 msgid ""
-"Please use:\n"
-"bzr branch %s\n"
+"Please use:\n%s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
-"Veuillez utiliser la commande :\n"
-"bzr branch %s\n"
+"Veuillez utiliser la commande :\n%s\n"
 "pour récupérer les dernières mises à jour (éventuellement non encore "
 "publiées) du paquet.\n"
 
diff --git a/po/gl.po b/po/gl.po
index 0ccb0f5af..620ea4351 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -378,11 +378,11 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "Please use:\n"
-"bzr branch %s\n"
+"%s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 "Empregue:\n"
-"bzr get %s\n"
+"%s\n"
 "para obter as últimas actualizacións (posibelmente non publicadas) do "
 "paquete.\n"
 
diff --git a/po/hu.po b/po/hu.po
index 0f3a63ea6..a9d493314 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -376,11 +376,11 @@ msgstr ""
 #, c-format
 msgid ""
 "Please use:\n"
-"bzr branch %s\n"
+"%s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 "Használja a következő parancsot:\n"
-"bzr branch %s\n"
+"%s\n"
 "a csomag legújabb (esetleg kiadatlan) frissítéseinek letöltéséhez.\n"
 
 #: cmdline/apt-get.cc:795
diff --git a/po/it.po b/po/it.po
index 1928e0095..5d142c043 100644
--- a/po/it.po
+++ b/po/it.po
@@ -383,11 +383,11 @@ msgstr ""
 #, c-format
 msgid ""
 "Please use:\n"
-"bzr branch %s\n"
+"%s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 "Utilizzare:\n"
-"bzr branch %s\n"
+"%s\n"
 "per recuperare gli ultimi (forse non rilasciati) aggiornamenti del "
 "pacchetto.\n"
 
diff --git a/po/ja.po b/po/ja.po
index c76bea125..0db418515 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -379,12 +379,12 @@ msgstr ""
 #, c-format
 msgid ""
 "Please use:\n"
-"bzr branch %s\n"
+"%s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 "パッケージの最新の (まだリリースされていないかもしれない) 更新を取得するに"
 "は、\n"
-"bzr branch %s\n"
+"%s\n"
 "を使用してください。\n"
 
 #: cmdline/apt-get.cc:795
diff --git a/po/km.po b/po/km.po
index d62cfe381..e3891963a 100644
--- a/po/km.po
+++ b/po/km.po
@@ -376,7 +376,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Please use:\n"
-"bzr branch %s\n"
+"%s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
diff --git a/po/ko.po b/po/ko.po
index c7e0a2c61..46f5ba3f6 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -368,12 +368,12 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "Please use:\n"
-"bzr branch %s\n"
+"%s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 "패키지의 최근 (아마도 릴리스되지 않은) 업데이트를 받으려면\n"
 "다음과 같이 하십시오:\n"
-"bzr get %s\n"
+"%s\n"
 
 #: cmdline/apt-get.cc:795
 #, c-format
diff --git a/po/ku.po b/po/ku.po
index 41e7be827..13c4ad8fe 100644
--- a/po/ku.po
+++ b/po/ku.po
@@ -337,7 +337,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Please use:\n"
-"bzr branch %s\n"
+"%s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
diff --git a/po/lt.po b/po/lt.po
index afacc8d58..0bbd11abd 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -337,7 +337,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Please use:\n"
-"bzr branch %s\n"
+"%s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
diff --git a/po/mr.po b/po/mr.po
index 1b01a9566..2de927fd6 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -370,7 +370,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Please use:\n"
-"bzr branch %s\n"
+"%s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
diff --git a/po/nb.po b/po/nb.po
index bd7566260..3d601a6fe 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -377,11 +377,11 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "Please use:\n"
-"bzr branch %s\n"
+"%s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 "Bruk:\n"
-"bzr get %s\n"
+"%s\n"
 "for å hente siste (muligens ikke utgitte) oppdateringer for pakken.\n"
 
 #: cmdline/apt-get.cc:795
diff --git a/po/ne.po b/po/ne.po
index 849de30fb..aa2241b1b 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -373,7 +373,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Please use:\n"
-"bzr branch %s\n"
+"%s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
diff --git a/po/nl.po b/po/nl.po
index 35aa17740..610790005 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -389,11 +389,11 @@ msgstr ""
 #, c-format
 msgid ""
 "Please use:\n"
-"bzr branch %s\n"
+"%s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 "Gebruik:\n"
-"bzr branch %s\n"
+"%s\n"
 "om de nieuwste (mogelijk nog niet uitgebrachte) bijwerkingen van het pakket "
 "op te halen.\n"
 
diff --git a/po/nn.po b/po/nn.po
index 34a2ef039..bf2e81a55 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -378,7 +378,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Please use:\n"
-"bzr branch %s\n"
+"%s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
diff --git a/po/pl.po b/po/pl.po
index afcd08cc9..e7a8affce 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -383,11 +383,11 @@ msgstr ""
 #, c-format
 msgid ""
 "Please use:\n"
-"bzr branch %s\n"
+"%s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 "Proszę użyć:\n"
-"bzr branch %s\n"
+"%s\n"
 "by pobrać najnowsze (prawdopodobnie jeszcze niewydane) poprawki tego "
 "pakietu.\n"
 
diff --git a/po/pt.po b/po/pt.po
index 6c4859cd5..f23f2912b 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -376,11 +376,11 @@ msgstr ""
 #, c-format
 msgid ""
 "Please use:\n"
-"bzr branch %s\n"
+"%s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 "Por favor utilize:\n"
-"bzr branch %s\n"
+"%s\n"
 "para obter as últimas actualizações (possivelmente por lançar) ao pacote.\n"
 
 #: cmdline/apt-get.cc:795
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 94e93c0aa..1acdba902 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -378,7 +378,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Please use:\n"
-"bzr branch %s\n"
+"%s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
diff --git a/po/ro.po b/po/ro.po
index 9f64fd6d7..3c887b697 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -375,7 +375,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Please use:\n"
-"bzr branch %s\n"
+"%s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
diff --git a/po/ru.po b/po/ru.po
index 4204d448a..830c8eaa8 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -383,11 +383,11 @@ msgstr ""
 #, c-format
 msgid ""
 "Please use:\n"
-"bzr branch %s\n"
+"%s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 "Используйте:\n"
-"bzr branch %s\n"
+"%s\n"
 "для получения последних (возможно не выпущенных) обновлений пакета.\n"
 
 #: cmdline/apt-get.cc:795
diff --git a/po/sk.po b/po/sk.po
index 9eda086f5..e29a56f04 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -375,11 +375,11 @@ msgstr ""
 #, c-format
 msgid ""
 "Please use:\n"
-"bzr branch %s\n"
+"%s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 "Prosím, použite:\n"
-"bzr branch %s\n"
+"%s\n"
 "ak chcete získať najnovšie (a pravdepodobne zatiaľ nevydané) aktualizácie "
 "balíka.\n"
 
diff --git a/po/sl.po b/po/sl.po
index d3eeb71ee..e568a98b4 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -373,11 +373,11 @@ msgstr ""
 #, c-format
 msgid ""
 "Please use:\n"
-"bzr branch %s\n"
+"%s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 "Uporabite:\n"
-"bzr branch %s\n"
+"%s\n"
 "za pridobitev zadnjih (morda še neizdanih) posodobitev paketa.\n"
 
 #: cmdline/apt-get.cc:795
diff --git a/po/sv.po b/po/sv.po
index 6d6979ce8..88a698dbd 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -379,11 +379,11 @@ msgstr ""
 #, c-format
 msgid ""
 "Please use:\n"
-"bzr branch %s\n"
+"%s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 "Använd:\n"
-"bzr branch %s\n"
+"%s\n"
 "för att hämta de senaste (möjligen inte utgivna) uppdateringarna av "
 "paketet.\n"
 
diff --git a/po/th.po b/po/th.po
index 23630d1be..06bab1a59 100644
--- a/po/th.po
+++ b/po/th.po
@@ -370,11 +370,11 @@ msgstr ""
 #, c-format
 msgid ""
 "Please use:\n"
-"bzr branch %s\n"
+"%s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 "กรุณาใช้:\n"
-"bzr branch %s\n"
+"%s\n"
 "เพื่อดึงรุ่นล่าสุด (ที่อาจยังไม่ปล่อยออกมา) ของตัวแพกเกจ\n"
 
 #: cmdline/apt-get.cc:795
diff --git a/po/tl.po b/po/tl.po
index 42c24bdf7..4618c8a32 100644
--- a/po/tl.po
+++ b/po/tl.po
@@ -378,7 +378,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Please use:\n"
-"bzr branch %s\n"
+"%s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
diff --git a/po/tr.po b/po/tr.po
index a29f92343..08568c73c 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -382,12 +382,12 @@ msgstr ""
 #, c-format
 msgid ""
 "Please use:\n"
-"bzr branch %s\n"
+"%s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 "Bu paketin en son (ve muhtemelen henüz yayımlanmamış olan)\n"
 "sürümünü edinmek için lütfen:\n"
-"bzr branch %s\n"
+"%s\n"
 "komutunu kullanın.\n"
 
 #: cmdline/apt-get.cc:795
diff --git a/po/uk.po b/po/uk.po
index dbc15c148..78fd1c755 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -379,11 +379,11 @@ msgstr ""
 #, c-format
 msgid ""
 "Please use:\n"
-"bzr branch %s\n"
+"%s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 "Будь-ласка використовуйте:\n"
-"bzr branch %s\n"
+"%s\n"
 "щоб отримати найновіші (потенційно не випущені) оновлення до пакунку.\n"
 
 #: cmdline/apt-get.cc:795
diff --git a/po/vi.po b/po/vi.po
index 57f1d228b..27180663b 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -387,11 +387,11 @@ msgstr ""
 #, c-format
 msgid ""
 "Please use:\n"
-"bzr branch %s\n"
+"%s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 "Hãy dùng lệnh:\n"
-"bzr branch %s\n"
+"%s\n"
 "để lấy các gói mới nhất (có thể là chưa phát hành).\n"
 
 #: cmdline/apt-get.cc:795
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 6706bb88a..41cd532e4 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -372,11 +372,11 @@ msgstr ""
 #, c-format
 msgid ""
 "Please use:\n"
-"bzr branch %s\n"
+"%s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 "请使用：\n"
-"bzr branch %s\n"
+"%s\n"
 "获得该软件包的最近更新(可能尚未正式发布)。\n"
 
 #: cmdline/apt-get.cc:795
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 7310b151f..7e7c61c6f 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -371,7 +371,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Please use:\n"
-"bzr branch %s\n"
+"%s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
diff --git a/test/integration/test-apt-get-source b/test/integration/test-apt-get-source
index 6791bdd98..763318743 100755
--- a/test/integration/test-apt-get-source
+++ b/test/integration/test-apt-get-source
@@ -27,6 +27,9 @@ insertsource 'stable' 'foo' 'all' '1.0'
 insertsource 'wheezy' 'foo' 'all' '0.0.1'
 insertsource 'wheezy' 'foo' 'all' '0.1'
 
+insertsource 'stable' 'bar' 'any' '1.1' 'Vcs-Browser: https://anonscm.debian.org/cgit/bar/bar.git
+Vcs-Git: git://anonscm.debian.org/bar/bar.git -b debian/experimental'
+
 setupaptarchive
 
 APTARCHIVE=$(readlink -f ./aptarchive)
@@ -42,6 +45,8 @@ DOWNLOAD2="Need to get 0 B/25 B of source archives.
 'file://${APTARCHIVE}/foo_2.0.tar.gz' foo_2.0.tar.gz 14 SHA256:ca9b0b828ca22372502af2b80f61f0bd9063910ece9fc34eeaf9d9e31aa8195a"
 testsuccessequal "$HEADER
 $DOWNLOAD2" aptget source -q --print-uris foo
+testsuccessequal "$HEADER
+$DOWNLOAD2" aptget source -q --print-uris foo foo
 
 # select by release: suite
 testsuccessequal "$HEADER
@@ -93,3 +98,17 @@ $DOWNLOAD001" aptget source -q --print-uris -t unstable foo=0.0.1
 testsuccessequal "$HEADER
 Need to get 0 B/25 B of source archives.
 Fetch source foo" aptget source -q -s foo
+
+testfailureequal 'Reading package lists...
+Building dependency tree...
+E: Must specify at least one package to fetch source for' aptget source
+
+testsuccessequal "Reading package lists...
+Building dependency tree...
+NOTICE: 'bar' packaging is maintained in the 'Git' version control system at:
+git://anonscm.debian.org/bar/bar.git -b debian/experimental
+Please use:
+git clone git://anonscm.debian.org/bar/bar.git -b debian/experimental
+to retrieve the latest (possibly unreleased) updates to the package.
+Need to get 0 B/25 B of source archives.
+Fetch source bar" aptget source bar -s