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.

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index ebc8c94c27dbc1f4378327ce86eea2262e300b1a..cef7d8c1477c08d57514e88a28fafcfe66d88484 100644 (file)
--- 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 <string.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>

-#include <sys/wait.h>

 #include <unistd.h>
 #include <pwd.h>
 #include <grp.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);
         }
         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());
         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;
       }
 
         break;
       }
 


@@ -936,19 +940,7 @@ static bool DoSource(CommandLine &CmdL)
       _exit(0);
    }
 
       _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  /*{{{*/
 }
                                                                        /*}}}*/
 // DoBuildDep - Install/removes packages to satisfy build dependencies  /*{{{*/

diff --git a/po/apt-all.pot b/po/apt-all.pot
index d241d6f1aace3a21110296e30889a14639756bda..9074ec72b30d71004280dff1be266e990b3c2a86 100644 (file)
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -315,8 +315,7 @@ msgstr ""
 #: cmdline/apt-get.cc:747
 #, c-format
 msgid ""
 #: 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 ""
 
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 

diff --git a/po/ar.po b/po/ar.po
index 66ef5c5452fc1e0f117abbebecc9bab4c7a66135..ccf1916d8bf728d65762c8ad820c6a152165a164 100644 (file)
--- a/po/ar.po
+++ b/po/ar.po
@@ -325,8 +325,7 @@ msgstr ""
 #: cmdline/apt-get.cc:747
 #, c-format
 msgid ""
 #: 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 ""
 
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 

diff --git a/po/ast.po b/po/ast.po
index 355a48f606eb3248e265e483b866355558954f7d..31aabfdc050bcb82e8ef8026a028e24e2b77794e 100644 (file)
--- a/po/ast.po
+++ b/po/ast.po
@@ -370,8 +370,7 @@ msgstr ""
 #: cmdline/apt-get.cc:747
 #, fuzzy, c-format
 msgid ""
 #: 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"
 "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 fe4e01131187d49c3ae55419fd266923a2710320..a58082a746d28de7890aaf58ba59a0fc965a33e3 100644 (file)
--- a/po/bg.po
+++ b/po/bg.po
@@ -375,12 +375,10 @@ msgstr ""
 #: cmdline/apt-get.cc:747
 #, c-format
 msgid ""
 #: 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 ""
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""

-"Използвайте:\n"
-"bzr branch %s\n"
+"Използвайте:\n%s\n"

 "за да изтеглите последните промени в пакета (евентуално в процес на "
 "разработка).\n"
 
 "за да изтеглите последните промени в пакета (евентуално в процес на "
 "разработка).\n"
 

diff --git a/po/bs.po b/po/bs.po
index 4641443b2ed4d5092d80258d21f4883bd5047694..e956259e2a3b9b5e05bd2cbe860f487bc6df028c 100644 (file)
--- a/po/bs.po
+++ b/po/bs.po
@@ -331,8 +331,7 @@ msgstr ""
 #: cmdline/apt-get.cc:747
 #, c-format
 msgid ""
 #: 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 ""
 
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 

diff --git a/po/ca.po b/po/ca.po
index b1d0841f67e64963312c3f71fe815dda62c3becb..ec59c5b400ba900a8c96c8c7ec166ca501ef67e4 100644 (file)
--- a/po/ca.po
+++ b/po/ca.po
@@ -376,12 +376,10 @@ msgstr ""
 #: cmdline/apt-get.cc:747
 #, c-format
 msgid ""
 #: 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 ""
 "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"
 
 "per obtenir les últimes actualitzacions (possiblement no publicades) del "
 "paquet.\n"
 

diff --git a/po/cs.po b/po/cs.po
index 27f41486afe68975c200f425d9030157c68f40fb..3c6b7639aac3caa0372d00f0045af173c1231e9b 100644 (file)
--- a/po/cs.po
+++ b/po/cs.po
@@ -367,13 +367,11 @@ msgstr ""
 #: cmdline/apt-get.cc:747
 #, c-format
 msgid ""
 #: 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 "
 "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
 
 #: cmdline/apt-get.cc:795
 #, c-format

diff --git a/po/cy.po b/po/cy.po
index e3eb9baf065aa342c0ba51cb16a487c3311fa0e5..c4ebfd0d1df1430d1aa871e4fa1ffef495107045 100644 (file)
--- a/po/cy.po
+++ b/po/cy.po
@@ -389,8 +389,7 @@ msgstr ""
 #: cmdline/apt-get.cc:747
 #, c-format
 msgid ""
 #: 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 ""
 
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 

diff --git a/po/da.po b/po/da.po
index 2672994b0996cd7fcb3b34f3d105dcfe16146999..86db650c00065aa840e0a174dbe4bccc3b65d79f 100644 (file)
--- a/po/da.po
+++ b/po/da.po
@@ -378,12 +378,10 @@ msgstr ""
 #: cmdline/apt-get.cc:747
 #, c-format
 msgid ""
 #: 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 ""
 "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
 "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 fdfabac1ad76f503d517c0c3c8f4b7939298b7e2..a40d08c14659bcc2a630f6ec361352a925c7df9d 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -391,12 +391,10 @@ msgstr ""
 #: cmdline/apt-get.cc:747
 #, c-format
 msgid ""
 #: 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 ""
 "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"
 
 "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 2b697175aa23308912a742a27aa9ede50fc0cae8..97c41973f90161159286af2f03b68594e23a8742 100644 (file)
--- a/po/dz.po
+++ b/po/dz.po
@@ -376,8 +376,7 @@ msgstr ""
 #: cmdline/apt-get.cc:747
 #, c-format
 msgid ""
 #: 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 ""
 
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 

diff --git a/po/el.po b/po/el.po
index 2a66769e48c7e1bca6c4e755e49c1e530487f7aa..04ceb86c432a59d519d314cfe9cef628ff488926 100644 (file)
--- a/po/el.po
+++ b/po/el.po
@@ -385,8 +385,7 @@ msgstr ""
 #: cmdline/apt-get.cc:747
 #, c-format
 msgid ""
 #: 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 ""
 
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 

diff --git a/po/es.po b/po/es.po
index a0cf2463640c87d06061e38fabcfb0851a9ae66a..05a5c9b34ecc2573ab21b6d1c0a04a5ca0a051aa 100644 (file)
--- a/po/es.po
+++ b/po/es.po
@@ -440,12 +440,10 @@ msgstr ""
 #: cmdline/apt-get.cc:747
 #, c-format
 msgid ""
 #: 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 ""
 "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"
 
 "para obtener las últimas actualizaciones (posiblemente no publicadas aún) "
 "del paquete.\n"
 

diff --git a/po/eu.po b/po/eu.po
index 285b96c60b1c7a750cc5d70c66eaba01c36788fd..d5e3f1c009dc5c95c0ff8be9e1970c2a5a9c9952 100644 (file)
--- a/po/eu.po
+++ b/po/eu.po
@@ -372,8 +372,7 @@ msgstr ""
 #: cmdline/apt-get.cc:747
 #, c-format
 msgid ""
 #: 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 ""
 
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 

diff --git a/po/fi.po b/po/fi.po
index bf8d9a98a57c4ca4646ca6be27755088090a8f38..e14a546fce3bd1b16d0f0b2dbdc07f688248a410 100644 (file)
--- a/po/fi.po
+++ b/po/fi.po
@@ -369,8 +369,7 @@ msgstr ""
 #: cmdline/apt-get.cc:747
 #, c-format
 msgid ""
 #: 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 ""
 
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 

diff --git a/po/fr.po b/po/fr.po
index 00e259aa34afdea9924a7049e9d04d416c988507..fbc411cdf904f4d75f7e2d4dd63397233e0b74a7 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -388,12 +388,10 @@ msgstr ""
 #: cmdline/apt-get.cc:747
 #, c-format
 msgid ""
 #: 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 ""
 "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"
 
 "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 0ccb0f5af98d5365230cdeafbfe6cee4a394a00e..620ea43510af9a705126bba2cbe194086a43c03f 100644 (file)
--- a/po/gl.po
+++ b/po/gl.po
@@ -378,11 +378,11 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "Please use:\n"
 #, 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"
 "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"
 
 "para obter as últimas actualizacións (posibelmente non publicadas) do "
 "paquete.\n"
 

diff --git a/po/hu.po b/po/hu.po
index 0f3a63ea66a57a2a13e05da3cc6f1331c374f8d1..a9d493314df6980004569054161635ef82e50e07 100644 (file)
--- a/po/hu.po
+++ b/po/hu.po
@@ -376,11 +376,11 @@ msgstr ""
 #, c-format
 msgid ""
 "Please use:\n"
 #, 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"
 "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
 "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 1928e00950ad66a88155a5c5291b94861e2bbeec..5d142c0436e6110dd225087e96d8f7a53bbf61a8 100644 (file)
--- a/po/it.po
+++ b/po/it.po
@@ -383,11 +383,11 @@ msgstr ""
 #, c-format
 msgid ""
 "Please use:\n"
 #, 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"
 "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"
 
 "per recuperare gli ultimi (forse non rilasciati) aggiornamenti del "
 "pacchetto.\n"
 

diff --git a/po/ja.po b/po/ja.po
index c76bea1254cae0b13d6c6ffc9ac9927ce51f0f1a..0db418515b0e55c39888f246b208ec1d87dd5cbc 100644 (file)
--- a/po/ja.po
+++ b/po/ja.po
@@ -379,12 +379,12 @@ msgstr ""
 #, c-format
 msgid ""
 "Please use:\n"
 #, 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"
 "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
 "を使用してください。\n"
 
 #: cmdline/apt-get.cc:795

diff --git a/po/km.po b/po/km.po
index d62cfe3813f5454bfb599bfd5c213c7f8f043a6a..e3891963af9af2e9a142f558acc3ed47b9e43d7a 100644 (file)
--- a/po/km.po
+++ b/po/km.po
@@ -376,7 +376,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Please use:\n"
 #, c-format
 msgid ""
 "Please use:\n"

-"bzr branch %s\n"
+"%s\n"

 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 

diff --git a/po/ko.po b/po/ko.po
index c7e0a2c6175aa884ebb1895c5fe39da1b0b5ccf6..46f5ba3f67f6758954bce4aca89c183943fbffd0 100644 (file)
--- a/po/ko.po
+++ b/po/ko.po
@@ -368,12 +368,12 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "Please use:\n"
 #, 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"
 "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
 
 #: cmdline/apt-get.cc:795
 #, c-format

diff --git a/po/ku.po b/po/ku.po
index 41e7be827a6e9be54cdce18a8db791a529f97602..13c4ad8febf07fb5847f6b81bbe10069d2ad76cd 100644 (file)
--- a/po/ku.po
+++ b/po/ku.po
@@ -337,7 +337,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Please use:\n"
 #, c-format
 msgid ""
 "Please use:\n"

-"bzr branch %s\n"
+"%s\n"

 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 

diff --git a/po/lt.po b/po/lt.po
index afacc8d588f15fc519477618794e71b4efc9989b..0bbd11abd818b5a620e942c47efad7a709dbadf7 100644 (file)
--- a/po/lt.po
+++ b/po/lt.po
@@ -337,7 +337,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Please use:\n"
 #, c-format
 msgid ""
 "Please use:\n"

-"bzr branch %s\n"
+"%s\n"

 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 

diff --git a/po/mr.po b/po/mr.po
index 1b01a9566ed547a858103776163154db09ff4b99..2de927fd6bf634a84cef3e4dcc2daa9bc2558c8a 100644 (file)
--- a/po/mr.po
+++ b/po/mr.po
@@ -370,7 +370,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Please use:\n"
 #, c-format
 msgid ""
 "Please use:\n"

-"bzr branch %s\n"
+"%s\n"

 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 

diff --git a/po/nb.po b/po/nb.po
index bd7566260e359d72a33595302bb7810d8d0c65c4..3d601a6fe395f80b87fda21877da54563654bd20 100644 (file)
--- a/po/nb.po
+++ b/po/nb.po
@@ -377,11 +377,11 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "Please use:\n"
 #, 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"
 "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
 "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 849de30fbee4217a7599873b7ad789bc44ba6e5b..aa2241b1bdf5af80b3118dc7e6a5f39767dd1a9c 100644 (file)
--- a/po/ne.po
+++ b/po/ne.po
@@ -373,7 +373,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Please use:\n"
 #, c-format
 msgid ""
 "Please use:\n"

-"bzr branch %s\n"
+"%s\n"

 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 

diff --git a/po/nl.po b/po/nl.po
index 35aa1774014e2856376a9ea74d677c8852a4673b..61079000517d08f7d54f94c3ca8196792263259d 100644 (file)
--- a/po/nl.po
+++ b/po/nl.po
@@ -389,11 +389,11 @@ msgstr ""
 #, c-format
 msgid ""
 "Please use:\n"
 #, 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"
 "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"
 
 "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 34a2ef0397f8910c3d513df2c6711519552912fb..bf2e81a55f4ff8c1f6ce11873b2a922e179b6e6d 100644 (file)
--- a/po/nn.po
+++ b/po/nn.po
@@ -378,7 +378,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Please use:\n"
 #, c-format
 msgid ""
 "Please use:\n"

-"bzr branch %s\n"
+"%s\n"

 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 

diff --git a/po/pl.po b/po/pl.po
index afcd08cc905eb77a7b0fdebcfccda43957a2adf4..e7a8affcef68dc2320e28f6429b4959c87f819a2 100644 (file)
--- a/po/pl.po
+++ b/po/pl.po
@@ -383,11 +383,11 @@ msgstr ""
 #, c-format
 msgid ""
 "Please use:\n"
 #, 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"
 "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"
 
 "by pobrać najnowsze (prawdopodobnie jeszcze niewydane) poprawki tego "
 "pakietu.\n"
 

diff --git a/po/pt.po b/po/pt.po
index 6c4859cd5ce3a15bc2e8692c5ee7c1e4fdce2c9d..f23f2912be5d23579041b67f522861ac70d179b8 100644 (file)
--- a/po/pt.po
+++ b/po/pt.po
@@ -376,11 +376,11 @@ msgstr ""
 #, c-format
 msgid ""
 "Please use:\n"
 #, 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"
 "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
 "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 94e93c0aa36375dc26d0689b09682e93db90c275..1acdba902fbe06f4ca4b8abd361d23cc24cf940d 100644 (file)
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -378,7 +378,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Please use:\n"
 #, c-format
 msgid ""
 "Please use:\n"

-"bzr branch %s\n"
+"%s\n"

 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 

diff --git a/po/ro.po b/po/ro.po
index 9f64fd6d710b1361b091bb554c86e46d95a463c9..3c887b697264e958b7d30cd57987b8810e87e599 100644 (file)
--- a/po/ro.po
+++ b/po/ro.po
@@ -375,7 +375,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Please use:\n"
 #, c-format
 msgid ""
 "Please use:\n"

-"bzr branch %s\n"
+"%s\n"

 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 

diff --git a/po/ru.po b/po/ru.po
index 4204d448a885145d0f685f1e5d2f083826235f94..830c8eaa8f37f8f174a0edc9bdf7e7591d232ce6 100644 (file)
--- a/po/ru.po
+++ b/po/ru.po
@@ -383,11 +383,11 @@ msgstr ""
 #, c-format
 msgid ""
 "Please use:\n"
 #, 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"
 "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
 "для получения последних (возможно не выпущенных) обновлений пакета.\n"
 
 #: cmdline/apt-get.cc:795

diff --git a/po/sk.po b/po/sk.po
index 9eda086f52cca79bd0736e97310bbf6262b8097e..e29a56f0439f146fb713a6e95d81bc5502dfcb42 100644 (file)
--- a/po/sk.po
+++ b/po/sk.po
@@ -375,11 +375,11 @@ msgstr ""
 #, c-format
 msgid ""
 "Please use:\n"
 #, 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"
 "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"
 
 "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 d3eeb71ee8da3d46bf1a4d95c531edc49d40e8ff..e568a98b42caacd990768a4c1f7f9ce8ec5ecebc 100644 (file)
--- a/po/sl.po
+++ b/po/sl.po
@@ -373,11 +373,11 @@ msgstr ""
 #, c-format
 msgid ""
 "Please use:\n"
 #, 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"
 "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
 "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 6d6979ce81ee90bc75cce76731d8d801a311a8e9..88a698dbd599bfe649b7df61fc9025d9490860a9 100644 (file)
--- a/po/sv.po
+++ b/po/sv.po
@@ -379,11 +379,11 @@ msgstr ""
 #, c-format
 msgid ""
 "Please use:\n"
 #, 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"
 "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"
 
 "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 23630d1be8068d31cd0cd0e807788099d30f81b7..06bab1a595edf4c5220a9118210d0f369caa916b 100644 (file)
--- a/po/th.po
+++ b/po/th.po
@@ -370,11 +370,11 @@ msgstr ""
 #, c-format
 msgid ""
 "Please use:\n"
 #, 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"
 "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
 "เพื่อดึงรุ่นล่าสุด (ที่อาจยังไม่ปล่อยออกมา) ของตัวแพกเกจ\n"
 
 #: cmdline/apt-get.cc:795

diff --git a/po/tl.po b/po/tl.po
index 42c24bdf7d43384294815f2549095795d3c60296..4618c8a322b04ff21ad0d4c01a04284676ab5560 100644 (file)
--- a/po/tl.po
+++ b/po/tl.po
@@ -378,7 +378,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Please use:\n"
 #, c-format
 msgid ""
 "Please use:\n"

-"bzr branch %s\n"
+"%s\n"

 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 

diff --git a/po/tr.po b/po/tr.po
index a29f9234372126a65771351cba2871fbedf03995..08568c73c0f49dc551eb03b7edc0751fdeceab22 100644 (file)
--- a/po/tr.po
+++ b/po/tr.po
@@ -382,12 +382,12 @@ msgstr ""
 #, c-format
 msgid ""
 "Please use:\n"
 #, 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"
 "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
 "komutunu kullanın.\n"
 
 #: cmdline/apt-get.cc:795

diff --git a/po/uk.po b/po/uk.po
index dbc15c148872f6f75607f7f6a8a9763f1ff4ae86..78fd1c75508effd86f479b3ac341638d1832db70 100644 (file)
--- a/po/uk.po
+++ b/po/uk.po
@@ -379,11 +379,11 @@ msgstr ""
 #, c-format
 msgid ""
 "Please use:\n"
 #, 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"
 "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
 "щоб отримати найновіші (потенційно не випущені) оновлення до пакунку.\n"
 
 #: cmdline/apt-get.cc:795

diff --git a/po/vi.po b/po/vi.po
index 57f1d228bf4d5b521ba0b450e8b268f6593c49cb..27180663b88d3569fc961ac4577ca375e241a04e 100644 (file)
--- a/po/vi.po
+++ b/po/vi.po
@@ -387,11 +387,11 @@ msgstr ""
 #, c-format
 msgid ""
 "Please use:\n"
 #, 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"
 "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
 "để 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 6706bb88a2aa53af154f9a5dcc7ed5ac8131d90e..41cd532e49b790c36460c122d4e78ec9c03bbab1 100644 (file)
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -372,11 +372,11 @@ msgstr ""
 #, c-format
 msgid ""
 "Please use:\n"
 #, 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"
 "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
 "获得该软件包的最近更新(可能尚未正式发布)。\n"
 
 #: cmdline/apt-get.cc:795

diff --git a/po/zh_TW.po b/po/zh_TW.po
index 7310b151fc7b465e3edb38a12a2d56c27477dd10..7e7c61c6f21070fd0feccaa9bf21236769979915 100644 (file)
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -371,7 +371,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Please use:\n"
 #, c-format
 msgid ""
 "Please use:\n"

-"bzr branch %s\n"
+"%s\n"

 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
 "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 6791bdd983ab55880c556c50e341dd0fd911ca42..763318743d9dc0067d935d72c3ed8a51614d0d5a 100755 (executable)
--- 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 '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)
 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
 '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
 
 # 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
 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