diff options
| -rw-r--r-- | cmdline/apt-get.cc | 34 | ||||
| -rw-r--r-- | po/apt-all.pot | 3 | ||||
| -rw-r--r-- | po/ar.po | 3 | ||||
| -rw-r--r-- | po/ast.po | 3 | ||||
| -rw-r--r-- | po/bg.po | 6 | ||||
| -rw-r--r-- | po/bs.po | 3 | ||||
| -rw-r--r-- | po/ca.po | 6 | ||||
| -rw-r--r-- | po/cs.po | 6 | ||||
| -rw-r--r-- | po/cy.po | 3 | ||||
| -rw-r--r-- | po/da.po | 6 | ||||
| -rw-r--r-- | po/de.po | 6 | ||||
| -rw-r--r-- | po/dz.po | 3 | ||||
| -rw-r--r-- | po/el.po | 3 | ||||
| -rw-r--r-- | po/es.po | 6 | ||||
| -rw-r--r-- | po/eu.po | 3 | ||||
| -rw-r--r-- | po/fi.po | 3 | ||||
| -rw-r--r-- | po/fr.po | 6 | ||||
| -rw-r--r-- | po/gl.po | 4 | ||||
| -rw-r--r-- | po/hu.po | 4 | ||||
| -rw-r--r-- | po/it.po | 4 | ||||
| -rw-r--r-- | po/ja.po | 4 | ||||
| -rw-r--r-- | po/km.po | 2 | ||||
| -rw-r--r-- | po/ko.po | 4 | ||||
| -rw-r--r-- | po/ku.po | 2 | ||||
| -rw-r--r-- | po/lt.po | 2 | ||||
| -rw-r--r-- | po/mr.po | 2 | ||||
| -rw-r--r-- | po/nb.po | 4 | ||||
| -rw-r--r-- | po/ne.po | 2 | ||||
| -rw-r--r-- | po/nl.po | 4 | ||||
| -rw-r--r-- | po/nn.po | 2 | ||||
| -rw-r--r-- | po/pl.po | 4 | ||||
| -rw-r--r-- | po/pt.po | 4 | ||||
| -rw-r--r-- | po/pt_BR.po | 2 | ||||
| -rw-r--r-- | po/ro.po | 2 | ||||
| -rw-r--r-- | po/ru.po | 4 | ||||
| -rw-r--r-- | po/sk.po | 4 | ||||
| -rw-r--r-- | po/sl.po | 4 | ||||
| -rw-r--r-- | po/sv.po | 4 | ||||
| -rw-r--r-- | po/th.po | 4 | ||||
| -rw-r--r-- | po/tl.po | 2 | ||||
| -rw-r--r-- | po/tr.po | 4 | ||||
| -rw-r--r-- | po/uk.po | 4 | ||||
| -rw-r--r-- | po/vi.po | 4 | ||||
| -rw-r--r-- | po/zh_CN.po | 4 | ||||
| -rw-r--r-- | po/zh_TW.po | 2 | ||||
| -rwxr-xr-x | test/integration/test-apt-get-source | 19 |
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 "" @@ -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 "" @@ -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" @@ -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" @@ -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 "" @@ -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" @@ -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 @@ -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 "" @@ -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 @@ -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" @@ -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 "" @@ -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 "" @@ -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" @@ -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 "" @@ -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 "" @@ -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" @@ -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" @@ -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 @@ -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" @@ -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 @@ -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 "" @@ -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 @@ -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 "" @@ -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 "" @@ -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 "" @@ -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 @@ -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 "" @@ -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" @@ -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 "" @@ -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" @@ -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 "" @@ -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 "" @@ -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 @@ -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" @@ -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 @@ -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" @@ -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 @@ -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 "" @@ -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 @@ -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 @@ -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 |