From 210f0c31fadf00c0acb3f83ac57ff65a4ce0ed8d Mon Sep 17 00:00:00 2001 From: "bubulle@debian.org" <> Date: Tue, 25 Oct 2011 05:20:03 +0530 Subject: French translation update --- po/fr.po | 72 +++++++++++++++++++++++++++++++++++----------------------------- 1 file changed, 39 insertions(+), 33 deletions(-) diff --git a/po/fr.po b/po/fr.po index d70cf8da0..cc2a9d8ba 100644 --- a/po/fr.po +++ b/po/fr.po @@ -9,14 +9,14 @@ msgstr "" "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2011-07-26 12:05+0200\n" -"PO-Revision-Date: 2011-02-16 07:44+0100\n" +"PO-Revision-Date: 2011-10-24 22:52+0100\n" "Last-Translator: Christian Perrier \n" "Language-Team: French \n" "Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.0\n" +"X-Generator: Lokalize 1.2\n" "Plural-Forms: Plural-Forms: nplurals=2; plural=n>1;\n" #: cmdline/apt-cache.cc:154 @@ -109,7 +109,7 @@ msgstr "Vous devez fournir au moins un motif de recherche" #: cmdline/apt-cache.cc:1353 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." -msgstr "" +msgstr "Cette commande est obsolète. Veuillez utiliser « apt-mark showauto »." #: cmdline/apt-cache.cc:1448 apt-pkg/cacheset.cc:440 #, c-format @@ -162,7 +162,6 @@ msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s pour %s compilé sur %s %s\n" #: cmdline/apt-cache.cc:1682 -#, fuzzy msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] showpkg pkg1 [pkg2 ...]\n" @@ -216,7 +215,6 @@ msgstr "" " unmet - Affiche les dépendances manquantes\n" " search - Cherche une expression rationnelle dans la liste des paquets\n" " show - Affiche la description du paquet\n" -" showauto - Affiche la liste des paquets installés automatiquement\n" " depends - Affiche toutes les dépendances d'un paquet\n" " rdepends - Affiche les dépendances inverses d'un paquet\n" " pkgnames - Liste le nom de tous les paquets du système\n" @@ -1197,6 +1195,8 @@ msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" +"Cette commande est obsolète. Veuillez utiliser « apt-mark auto » et " +"« apt-mark manual »." #: cmdline/apt-get.cc:2114 msgid "Calculating upgrade... " @@ -1325,6 +1325,9 @@ msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" +"Aucune information sur l'architecture n'est disponible pour %s. Veuillez " +"consulter la section à propos de APT::Architectures dans la page de manuel " +"apt.conf(5)." #: cmdline/apt-get.cc:2718 #, c-format @@ -1337,13 +1340,13 @@ msgid "%s has no build depends.\n" msgstr "%s n'a pas de dépendance de construction.\n" #: cmdline/apt-get.cc:2868 -#, fuzzy, c-format +#, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" msgstr "" -"La dépendance %s vis-à-vis de %s ne peut être satisfaite car le paquet %s ne " -"peut être trouvé" +"La dépendance %s vis-à-vis de %s ne peut être satisfaite car %s n'est pas " +"autorisé avec les paquets « %s »." #: cmdline/apt-get.cc:2889 #, c-format @@ -1362,22 +1365,22 @@ msgstr "" "est trop récent" #: cmdline/apt-get.cc:2951 -#, fuzzy, c-format +#, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " "package %s can't satisfy version requirements" msgstr "" "La dépendance %s vis-à-vis de %s ne peut être satisfaite car aucune version " -"du paquet %s ne peut satisfaire à la version requise" +"disponible du paquet %s ne peut satisfaire les prérequis de version." #: cmdline/apt-get.cc:2957 -#, fuzzy, c-format +#, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "" -"La dépendance %s vis-à-vis de %s ne peut être satisfaite car le paquet %s ne " -"peut être trouvé" +"La dépendance %s vis-à-vis de %s ne peut être satisfaite car le paquet %s n'a " +"pas de version disponible." #: cmdline/apt-get.cc:2980 #, c-format @@ -1404,7 +1407,6 @@ msgid "Supported modules:" msgstr "Modules reconnus :" #: cmdline/apt-get.cc:3266 -#, fuzzy msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1471,8 +1473,6 @@ msgstr "" " clean - Supprime dans le cache local tous les fichiers téléchargés\n" " autoclean - Supprime dans le cache local les fichiers inutiles\n" " check - Vérifie qu'il n'y a pas de rupture de dépendances\n" -" markauto - Marque les paquets indiqués comme installés automatiquement\n" -" unmarkauto - Marque les paquets indiqués comme installés manuellement\n" " changelog - Télécharge et affiche le journal des modifications\n" " («  changelog ») du paquet indiqué\n" " download - Télécharge le paquet dinaire dans le répertoire courant\n" @@ -1548,43 +1548,45 @@ msgstr "" "dans le lecteur « %s » et appuyez sur la touche Entrée\n" #: cmdline/apt-mark.cc:46 -#, fuzzy, c-format +#, c-format msgid "%s can not be marked as it is not installed.\n" -msgstr "mais il n'est pas installé" +msgstr "%s ne peut pas être marqué car il n'est pas installé.\n" #: cmdline/apt-mark.cc:52 -#, fuzzy, c-format +#, c-format msgid "%s was already set to manually installed.\n" -msgstr "%s passé en « installé manuellement ».\n" +msgstr "%s était déjà marqué comme installé manuellement.\n" #: cmdline/apt-mark.cc:54 -#, fuzzy, c-format +#, c-format msgid "%s was already set to automatically installed.\n" -msgstr "%s passé en « installé automatiquement ».\n" +msgstr "%s était déjà marqué comme installé automatiquement.\n" #: cmdline/apt-mark.cc:169 -#, fuzzy, c-format +#, c-format msgid "%s was already set on hold.\n" -msgstr "%s est déjà la plus récente version disponible.\n" +msgstr "%s était déjà marqué comme figé (« hold »).\n" #: cmdline/apt-mark.cc:171 -#, fuzzy, c-format +#, c-format msgid "%s was already not hold.\n" -msgstr "%s est déjà la plus récente version disponible.\n" +msgstr "%s était déjà marqué comme non figé.\n" #: cmdline/apt-mark.cc:185 cmdline/apt-mark.cc:207 -#, fuzzy, c-format +#, c-format msgid "%s set on hold.\n" -msgstr "%s passé en « installé manuellement ».\n" +msgstr "%s passé en figé (« hold »).\n" #: cmdline/apt-mark.cc:187 cmdline/apt-mark.cc:212 -#, fuzzy, c-format +#, c-format msgid "Canceled hold on %s.\n" -msgstr "Impossible d'ouvrir %s" +msgstr "Annulation de l'état figé pour %s.\n" #: cmdline/apt-mark.cc:220 msgid "Executing dpkg failed. Are you root?" msgstr "" +"Échec de l'exécution de dpkg. Possédez-vous les privilèges du " +"superutilisateur ?" #: cmdline/apt-mark.cc:268 msgid "" @@ -3005,6 +3007,8 @@ msgid "" "The value '%s' is invalid for APT::Default-Release as such a release is not " "available in the sources" msgstr "" +"La valeur « %s » n'est pas valable pour APT::Default-Release car cette " +"version ne fait pas partie des sources disponibles." #: apt-pkg/policy.cc:389 #, c-format @@ -3162,6 +3166,8 @@ msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" +"Le fichier « Release » pour %s a expiré (plus valable depuis %s). Les mises à " +"jour depuis ce dépôt ne s'effectueront pas." #: apt-pkg/acquire-item.cc:1499 #, c-format @@ -3374,7 +3380,7 @@ msgstr "Somme de contrôle de hachage incohérente pour %s" #: apt-pkg/indexcopy.cc:677 #, c-format msgid "File %s doesn't start with a clearsigned message" -msgstr "" +msgstr "Le fichier %s ne commence pas par un message signé en clair." #. TRANSLATOR: %s is the trusted keyring parts directory #: apt-pkg/indexcopy.cc:708 @@ -3610,9 +3616,9 @@ msgstr "Aucun fichier miroir « %s » n'a été trouvé" #. FIXME: fallback to a default mirror here instead #. and provide a config option to define that default #: methods/mirror.cc:267 -#, fuzzy, c-format +#, c-format msgid "Can not read mirror file '%s'" -msgstr "Aucun fichier miroir « %s » n'a été trouvé" +msgstr "Impossible de lire le fichier de miroir « %s »." #: methods/mirror.cc:422 #, c-format -- cgit v1.2.3-70-g09d2 From 15fc8636b3e48eab5f3bc6f2e8c61c0409246909 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 9 Nov 2011 17:22:57 +0100 Subject: * apt-pkg/cacheset.cc: - make the cachesets real containers which can embedding any container to be able to use the same interface regardless of set or list usage --- apt-pkg/cacheset.cc | 381 ++++++++++++++++++++----------------- apt-pkg/cacheset.h | 524 +++++++++++++++++++++++++++++++++------------------ apt-pkg/edsp.h | 4 +- cmdline/apt-cache.cc | 8 +- cmdline/apt-get.cc | 20 +- debian/changelog | 5 +- 6 files changed, 565 insertions(+), 377 deletions(-) diff --git a/apt-pkg/cacheset.cc b/apt-pkg/cacheset.cc index 6b95eab70..b892ab4bf 100644 --- a/apt-pkg/cacheset.cc +++ b/apt-pkg/cacheset.cc @@ -29,7 +29,7 @@ /*}}}*/ namespace APT { // FromTask - Return all packages in the cache from a specific task /*{{{*/ -PackageSet PackageSet::FromTask(pkgCacheFile &Cache, std::string pattern, CacheSetHelper &helper) { +bool PackageContainerInterface::FromTask(PackageContainerInterface * const pci, pkgCacheFile &Cache, std::string pattern, CacheSetHelper &helper) { size_t const archfound = pattern.find_last_of(':'); std::string arch = "native"; if (archfound != std::string::npos) { @@ -38,13 +38,16 @@ PackageSet PackageSet::FromTask(pkgCacheFile &Cache, std::string pattern, CacheS } if (pattern[pattern.length() -1] != '^') - return APT::PackageSet(TASK); + return false; pattern.erase(pattern.length()-1); if (unlikely(Cache.GetPkgCache() == 0 || Cache.GetDepCache() == 0)) - return APT::PackageSet(TASK); + return false; + + bool const wasEmpty = pci->empty(); + if (wasEmpty == true) + pci->setConstructor(TASK); - PackageSet pkgset(TASK); // get the records pkgRecords Recs(Cache); @@ -54,9 +57,10 @@ PackageSet PackageSet::FromTask(pkgCacheFile &Cache, std::string pattern, CacheS snprintf(S, sizeof(S), "^Task:.*[, ]%s([, ]|$)", pattern.c_str()); if(regcomp(&Pattern,S, REG_EXTENDED | REG_NOSUB | REG_NEWLINE) != 0) { _error->Error("Failed to compile task regexp"); - return pkgset; + return false; } + bool found = false; for (pkgCache::GrpIterator Grp = Cache->GrpBegin(); Grp.end() == false; ++Grp) { pkgCache::PkgIterator Pkg = Grp.FindPkg(arch); if (Pkg.end() == true) @@ -75,22 +79,33 @@ PackageSet PackageSet::FromTask(pkgCacheFile &Cache, std::string pattern, CacheS if (regexec(&Pattern, buf, 0, 0, 0) != 0) continue; - pkgset.insert(Pkg); + pci->insert(Pkg); + helper.showTaskSelection(Pkg, pattern); + found = true; } regfree(&Pattern); - if (pkgset.empty() == true) - return helper.canNotFindTask(Cache, pattern); + if (found == false) { + helper.canNotFindTask(pci, Cache, pattern); + pci->setConstructor(UNKNOWN); + return false; + } + + if (wasEmpty == false && pci->getConstructor() != UNKNOWN) + pci->setConstructor(UNKNOWN); - helper.showTaskSelection(pkgset, pattern); - return pkgset; + return true; } /*}}}*/ // FromRegEx - Return all packages in the cache matching a pattern /*{{{*/ -PackageSet PackageSet::FromRegEx(pkgCacheFile &Cache, std::string pattern, CacheSetHelper &helper) { +bool PackageContainerInterface::FromRegEx(PackageContainerInterface * const pci, pkgCacheFile &Cache, std::string pattern, CacheSetHelper &helper) { static const char * const isregex = ".?+*|[^$"; if (pattern.find_first_of(isregex) == std::string::npos) - return PackageSet(REGEX); + return false; + + bool const wasEmpty = pci->empty(); + if (wasEmpty == true) + pci->setConstructor(REGEX); size_t archfound = pattern.find_last_of(':'); std::string arch = "native"; @@ -103,11 +118,11 @@ PackageSet PackageSet::FromRegEx(pkgCacheFile &Cache, std::string pattern, Cache } if (unlikely(Cache.GetPkgCache() == 0)) - return PackageSet(REGEX); + return false; APT::CacheFilter::PackageNameMatchesRegEx regexfilter(pattern); - PackageSet pkgset(REGEX); + bool found = false; for (pkgCache::GrpIterator Grp = Cache.GetPkgCache()->GrpBegin(); Grp.end() == false; ++Grp) { if (regexfilter(Grp) == false) continue; @@ -123,18 +138,25 @@ PackageSet PackageSet::FromRegEx(pkgCacheFile &Cache, std::string pattern, Cache continue; } - pkgset.insert(Pkg); + pci->insert(Pkg); + helper.showRegExSelection(Pkg, pattern); + found = true; } - if (pkgset.empty() == true) - return helper.canNotFindRegEx(Cache, pattern); + if (found == false) { + helper.canNotFindRegEx(pci, Cache, pattern); + pci->setConstructor(UNKNOWN); + return false; + } + + if (wasEmpty == false && pci->getConstructor() != UNKNOWN) + pci->setConstructor(UNKNOWN); - helper.showRegExSelection(pkgset, pattern); - return pkgset; + return true; } /*}}}*/ // FromName - Returns the package defined by this string /*{{{*/ -pkgCache::PkgIterator PackageSet::FromName(pkgCacheFile &Cache, +pkgCache::PkgIterator PackageContainerInterface::FromName(pkgCacheFile &Cache, std::string const &str, CacheSetHelper &helper) { std::string pkg = str; size_t archfound = pkg.find_last_of(':'); @@ -160,144 +182,131 @@ pkgCache::PkgIterator PackageSet::FromName(pkgCacheFile &Cache, return Pkg; } /*}}}*/ -// GroupedFromCommandLine - Return all versions specified on commandline/*{{{*/ -std::map PackageSet::GroupedFromCommandLine( - pkgCacheFile &Cache, const char **cmdline, - std::list const &mods, - unsigned short const &fallback, CacheSetHelper &helper) { - std::map pkgsets; - for (const char **I = cmdline; *I != 0; ++I) { - unsigned short modID = fallback; - std::string str = *I; - bool modifierPresent = false; - for (std::list::const_iterator mod = mods.begin(); - mod != mods.end(); ++mod) { - size_t const alength = strlen(mod->Alias); - switch(mod->Pos) { - case PackageSet::Modifier::POSTFIX: - if (str.compare(str.length() - alength, alength, - mod->Alias, 0, alength) != 0) - continue; - str.erase(str.length() - alength); - modID = mod->ID; - break; - case PackageSet::Modifier::PREFIX: - continue; - case PackageSet::Modifier::NONE: - continue; - } - modifierPresent = true; - break; - } - if (modifierPresent == true) { - bool const errors = helper.showErrors(false); - pkgCache::PkgIterator Pkg = FromName(Cache, *I, helper); - helper.showErrors(errors); - if (Pkg.end() == false) { - pkgsets[fallback].insert(Pkg); - continue; - } - } - pkgsets[modID].insert(PackageSet::FromString(Cache, str, helper)); - } - return pkgsets; -} - /*}}}*/ -// FromCommandLine - Return all packages specified on commandline /*{{{*/ -PackageSet PackageSet::FromCommandLine(pkgCacheFile &Cache, const char **cmdline, CacheSetHelper &helper) { - PackageSet pkgset; - for (const char **I = cmdline; *I != 0; ++I) { - PackageSet pset = FromString(Cache, *I, helper); - pkgset.insert(pset.begin(), pset.end()); - } - return pkgset; -} - /*}}}*/ // FromString - Return all packages matching a specific string /*{{{*/ -PackageSet PackageSet::FromString(pkgCacheFile &Cache, std::string const &str, CacheSetHelper &helper) { +bool PackageContainerInterface::FromString(PackageContainerInterface * const pci, pkgCacheFile &Cache, std::string const &str, CacheSetHelper &helper) { + bool found = true; _error->PushToStack(); - PackageSet pkgset; pkgCache::PkgIterator Pkg = FromName(Cache, str, helper); if (Pkg.end() == false) - pkgset.insert(Pkg); - else { - pkgset = FromTask(Cache, str, helper); - if (pkgset.empty() == true) { - pkgset = FromRegEx(Cache, str, helper); - if (pkgset.empty() == true) - pkgset = helper.canNotFindPackage(Cache, str); - } + pci->insert(Pkg); + else if (FromTask(pci, Cache, str, helper) == false && + FromRegEx(pci, Cache, str, helper) == false) + { + helper.canNotFindPackage(pci, Cache, str); + found = false; } - if (pkgset.empty() == false) + if (found == true) _error->RevertToStack(); else _error->MergeWithStack(); - return pkgset; + return found; } /*}}}*/ -// GroupedFromCommandLine - Return all versions specified on commandline/*{{{*/ -std::map VersionSet::GroupedFromCommandLine( - pkgCacheFile &Cache, const char **cmdline, - std::list const &mods, - unsigned short const &fallback, CacheSetHelper &helper) { - std::map versets; - for (const char **I = cmdline; *I != 0; ++I) { - unsigned short modID = fallback; - VersionSet::Version select = VersionSet::NEWEST; - std::string str = *I; - bool modifierPresent = false; - for (std::list::const_iterator mod = mods.begin(); - mod != mods.end(); ++mod) { - if (modID == fallback && mod->ID == fallback) - select = mod->SelectVersion; - size_t const alength = strlen(mod->Alias); - switch(mod->Pos) { - case VersionSet::Modifier::POSTFIX: - if (str.compare(str.length() - alength, alength, - mod->Alias, 0, alength) != 0) - continue; - str.erase(str.length() - alength); - modID = mod->ID; - select = mod->SelectVersion; - break; - case VersionSet::Modifier::PREFIX: - continue; - case VersionSet::Modifier::NONE: +// FromCommandLine - Return all packages specified on commandline /*{{{*/ +bool PackageContainerInterface::FromCommandLine(PackageContainerInterface * const pci, pkgCacheFile &Cache, const char **cmdline, CacheSetHelper &helper) { + bool found = false; + for (const char **I = cmdline; *I != 0; ++I) + found |= PackageContainerInterface::FromString(pci, Cache, *I, helper); + return found; +} + /*}}}*/ +// FromModifierCommandLine - helper doing the work for PKG:GroupedFromCommandLine /*{{{*/ +bool PackageContainerInterface::FromModifierCommandLine(unsigned short &modID, PackageContainerInterface * const pci, + pkgCacheFile &Cache, const char * cmdline, + std::list const &mods, CacheSetHelper &helper) { + std::string str = cmdline; + bool modifierPresent = false; + for (std::list::const_iterator mod = mods.begin(); + mod != mods.end(); ++mod) { + size_t const alength = strlen(mod->Alias); + switch(mod->Pos) { + case Modifier::POSTFIX: + if (str.compare(str.length() - alength, alength, + mod->Alias, 0, alength) != 0) continue; - } - modifierPresent = true; + str.erase(str.length() - alength); + modID = mod->ID; break; + case Modifier::PREFIX: + continue; + case Modifier::NONE: + continue; } - - if (modifierPresent == true) { - bool const errors = helper.showErrors(false); - VersionSet const vset = VersionSet::FromString(Cache, std::string(*I), select, helper, true); - helper.showErrors(errors); - if (vset.empty() == false) { - versets[fallback].insert(vset); + modifierPresent = true; + break; + } + if (modifierPresent == true) { + bool const errors = helper.showErrors(false); + pkgCache::PkgIterator Pkg = FromName(Cache, cmdline, helper); + helper.showErrors(errors); + if (Pkg.end() == false) { + pci->insert(Pkg); + return true; + } + } + return FromString(pci, Cache, str, helper); +} + /*}}}*/ +// FromModifierCommandLine - helper doing the work for VER:GroupedFromCommandLine /*{{{*/ +bool VersionContainerInterface::FromModifierCommandLine(unsigned short &modID, + VersionContainerInterface * const vci, + pkgCacheFile &Cache, const char * cmdline, + std::list const &mods, + CacheSetHelper &helper) { + Version select = NEWEST; + std::string str = cmdline; + bool modifierPresent = false; + unsigned short fallback = modID; + for (std::list::const_iterator mod = mods.begin(); + mod != mods.end(); ++mod) { + if (modID == fallback && mod->ID == fallback) + select = mod->SelectVersion; + size_t const alength = strlen(mod->Alias); + switch(mod->Pos) { + case Modifier::POSTFIX: + if (str.compare(str.length() - alength, alength, + mod->Alias, 0, alength) != 0) continue; - } + str.erase(str.length() - alength); + modID = mod->ID; + select = mod->SelectVersion; + break; + case Modifier::PREFIX: + continue; + case Modifier::NONE: + continue; } - versets[modID].insert(VersionSet::FromString(Cache, str, select , helper)); + modifierPresent = true; + break; } - return versets; + + if (modifierPresent == true) { + bool const errors = helper.showErrors(false); + bool const found = VersionContainerInterface::FromString(vci, Cache, cmdline, select, helper, true); + helper.showErrors(errors); + if (found == true) + return true; + } + return FromString(vci, Cache, str, select, helper); } /*}}}*/ // FromCommandLine - Return all versions specified on commandline /*{{{*/ -APT::VersionSet VersionSet::FromCommandLine(pkgCacheFile &Cache, const char **cmdline, - APT::VersionSet::Version const &fallback, CacheSetHelper &helper) { - VersionSet verset; +bool VersionContainerInterface::FromCommandLine(VersionContainerInterface * const vci, + pkgCacheFile &Cache, const char **cmdline, + Version const &fallback, CacheSetHelper &helper) { + bool found = false; for (const char **I = cmdline; *I != 0; ++I) - verset.insert(VersionSet::FromString(Cache, *I, fallback, helper)); - return verset; + found |= VersionContainerInterface::FromString(vci, Cache, *I, fallback, helper); + return found; } /*}}}*/ // FromString - Returns all versions spedcified by a string /*{{{*/ -APT::VersionSet VersionSet::FromString(pkgCacheFile &Cache, std::string pkg, - APT::VersionSet::Version const &fallback, CacheSetHelper &helper, - bool const &onlyFromName) { +bool VersionContainerInterface::FromString(VersionContainerInterface * const vci, + pkgCacheFile &Cache, std::string pkg, + Version const &fallback, CacheSetHelper &helper, + bool const onlyFromName) { std::string ver; bool verIsRel = false; size_t const vertag = pkg.find_last_of("/="); @@ -308,19 +317,20 @@ APT::VersionSet VersionSet::FromString(pkgCacheFile &Cache, std::string pkg, } PackageSet pkgset; if (onlyFromName == false) - pkgset = PackageSet::FromString(Cache, pkg, helper); + PackageContainerInterface::FromString(&pkgset, Cache, pkg, helper); else { - pkgset.insert(PackageSet::FromName(Cache, pkg, helper)); + pkgset.insert(PackageContainerInterface::FromName(Cache, pkg, helper)); } - VersionSet verset; bool errors = true; if (pkgset.getConstructor() != PackageSet::UNKNOWN) errors = helper.showErrors(false); + + bool found = false; for (PackageSet::const_iterator P = pkgset.begin(); P != pkgset.end(); ++P) { if (vertag == std::string::npos) { - verset.insert(VersionSet::FromPackage(Cache, P, fallback, helper)); + found |= VersionContainerInterface::FromPackage(vci, Cache, P, fallback, helper); continue; } pkgCache::VerIterator V; @@ -350,75 +360,78 @@ APT::VersionSet VersionSet::FromString(pkgCacheFile &Cache, std::string pkg, if (V.end() == true) continue; helper.showSelectedVersion(P, V, ver, verIsRel); - verset.insert(V); + vci->insert(V); + found = true; } if (pkgset.getConstructor() != PackageSet::UNKNOWN) helper.showErrors(errors); - return verset; + return found; } /*}}}*/ // FromPackage - versions from package based on fallback /*{{{*/ -VersionSet VersionSet::FromPackage(pkgCacheFile &Cache, pkgCache::PkgIterator const &P, - VersionSet::Version const &fallback, CacheSetHelper &helper) { - VersionSet verset; +bool VersionContainerInterface::FromPackage(VersionContainerInterface * const vci, + pkgCacheFile &Cache, + pkgCache::PkgIterator const &P, + Version const &fallback, + CacheSetHelper &helper) { pkgCache::VerIterator V; bool showErrors; + bool found = false; switch(fallback) { - case VersionSet::ALL: + case ALL: if (P->VersionList != 0) for (V = P.VersionList(); V.end() != true; ++V) - verset.insert(V); + found |= vci->insert(V); else - verset.insert(helper.canNotFindAllVer(Cache, P)); + helper.canNotFindAllVer(vci, Cache, P); break; - case VersionSet::CANDANDINST: - verset.insert(getInstalledVer(Cache, P, helper)); - verset.insert(getCandidateVer(Cache, P, helper)); + case CANDANDINST: + found |= vci->insert(getInstalledVer(Cache, P, helper)); + found |= vci->insert(getCandidateVer(Cache, P, helper)); break; - case VersionSet::CANDIDATE: - verset.insert(getCandidateVer(Cache, P, helper)); + case CANDIDATE: + found |= vci->insert(getCandidateVer(Cache, P, helper)); break; - case VersionSet::INSTALLED: - verset.insert(getInstalledVer(Cache, P, helper)); + case INSTALLED: + found |= vci->insert(getInstalledVer(Cache, P, helper)); break; - case VersionSet::CANDINST: + case CANDINST: showErrors = helper.showErrors(false); V = getCandidateVer(Cache, P, helper); if (V.end() == true) V = getInstalledVer(Cache, P, helper); helper.showErrors(showErrors); if (V.end() == false) - verset.insert(V); + found |= vci->insert(V); else - verset.insert(helper.canNotFindInstCandVer(Cache, P)); + helper.canNotFindInstCandVer(vci, Cache, P); break; - case VersionSet::INSTCAND: + case INSTCAND: showErrors = helper.showErrors(false); V = getInstalledVer(Cache, P, helper); if (V.end() == true) V = getCandidateVer(Cache, P, helper); helper.showErrors(showErrors); if (V.end() == false) - verset.insert(V); + found |= vci->insert(V); else - verset.insert(helper.canNotFindInstCandVer(Cache, P)); + helper.canNotFindInstCandVer(vci, Cache, P); break; - case VersionSet::NEWEST: + case NEWEST: if (P->VersionList != 0) - verset.insert(P.VersionList()); + found |= vci->insert(P.VersionList()); else - verset.insert(helper.canNotFindNewestVer(Cache, P)); + helper.canNotFindNewestVer(Cache, P); break; } - return verset; + return found; } /*}}}*/ // getCandidateVer - Returns the candidate version of the given package /*{{{*/ -pkgCache::VerIterator VersionSet::getCandidateVer(pkgCacheFile &Cache, +pkgCache::VerIterator VersionContainerInterface::getCandidateVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg, CacheSetHelper &helper) { pkgCache::VerIterator Cand; - if (Cache.IsPolicyBuilt() == true || Cache.IsDepCacheBuilt() == false) - { + if (Cache.IsPolicyBuilt() == true || Cache.IsDepCacheBuilt() == false) { if (unlikely(Cache.GetPolicy() == 0)) return pkgCache::VerIterator(Cache); Cand = Cache.GetPolicy()->GetCandidateVer(Pkg); @@ -431,13 +444,14 @@ pkgCache::VerIterator VersionSet::getCandidateVer(pkgCacheFile &Cache, } /*}}}*/ // getInstalledVer - Returns the installed version of the given package /*{{{*/ -pkgCache::VerIterator VersionSet::getInstalledVer(pkgCacheFile &Cache, +pkgCache::VerIterator VersionContainerInterface::getInstalledVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg, CacheSetHelper &helper) { if (Pkg->CurrentVer == 0) return helper.canNotFindInstalledVer(Cache, Pkg); return Pkg.CurrentVer(); } /*}}}*/ + // canNotFindPkgName - handle the case no package has this name /*{{{*/ pkgCache::PkgIterator CacheSetHelper::canNotFindPkgName(pkgCacheFile &Cache, std::string const &str) { @@ -447,46 +461,40 @@ pkgCache::PkgIterator CacheSetHelper::canNotFindPkgName(pkgCacheFile &Cache, } /*}}}*/ // canNotFindTask - handle the case no package is found for a task /*{{{*/ -PackageSet CacheSetHelper::canNotFindTask(pkgCacheFile &Cache, std::string pattern) { +void CacheSetHelper::canNotFindTask(PackageContainerInterface * const pci, pkgCacheFile &Cache, std::string pattern) { if (ShowError == true) _error->Insert(ErrorType, _("Couldn't find task '%s'"), pattern.c_str()); - return PackageSet(); } /*}}}*/ // canNotFindRegEx - handle the case no package is found by a regex /*{{{*/ -PackageSet CacheSetHelper::canNotFindRegEx(pkgCacheFile &Cache, std::string pattern) { +void CacheSetHelper::canNotFindRegEx(PackageContainerInterface * const pci, pkgCacheFile &Cache, std::string pattern) { if (ShowError == true) _error->Insert(ErrorType, _("Couldn't find any package by regex '%s'"), pattern.c_str()); - return PackageSet(); } /*}}}*/ // canNotFindPackage - handle the case no package is found from a string/*{{{*/ -PackageSet CacheSetHelper::canNotFindPackage(pkgCacheFile &Cache, std::string const &str) { - return PackageSet(); +void CacheSetHelper::canNotFindPackage(PackageContainerInterface * const pci, pkgCacheFile &Cache, std::string const &str) { } /*}}}*/ // canNotFindAllVer /*{{{*/ -VersionSet CacheSetHelper::canNotFindAllVer(pkgCacheFile &Cache, +void CacheSetHelper::canNotFindAllVer(VersionContainerInterface * const vci, pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg) { if (ShowError == true) _error->Insert(ErrorType, _("Can't select versions from package '%s' as it is purely virtual"), Pkg.FullName(true).c_str()); - return VersionSet(); } /*}}}*/ // canNotFindInstCandVer /*{{{*/ -VersionSet CacheSetHelper::canNotFindInstCandVer(pkgCacheFile &Cache, +void CacheSetHelper::canNotFindInstCandVer(VersionContainerInterface * const vci, pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg) { if (ShowError == true) _error->Insert(ErrorType, _("Can't select installed nor candidate version from package '%s' as it has neither of them"), Pkg.FullName(true).c_str()); - return VersionSet(); } /*}}}*/ // canNotFindInstCandVer /*{{{*/ -VersionSet CacheSetHelper::canNotFindCandInstVer(pkgCacheFile &Cache, +void CacheSetHelper::canNotFindCandInstVer(VersionContainerInterface * const vci, pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg) { if (ShowError == true) _error->Insert(ErrorType, _("Can't select installed nor candidate version from package '%s' as it has neither of them"), Pkg.FullName(true).c_str()); - return VersionSet(); } /*}}}*/ // canNotFindNewestVer /*{{{*/ @@ -513,4 +521,21 @@ pkgCache::VerIterator CacheSetHelper::canNotFindInstalledVer(pkgCacheFile &Cache return pkgCache::VerIterator(Cache, 0); } /*}}}*/ +// showTaskSelection /*{{{*/ +void CacheSetHelper::showTaskSelection(pkgCache::PkgIterator const &pkg, + std::string const &pattern) { +} + /*}}}*/ +// showRegExSelection /*{{{*/ +void CacheSetHelper::showRegExSelection(pkgCache::PkgIterator const &pkg, + std::string const &pattern) { +} + /*}}}*/ +// showSelectedVersion /*{{{*/ +void CacheSetHelper::showSelectedVersion(pkgCache::PkgIterator const &Pkg, + pkgCache::VerIterator const Ver, + std::string const &ver, + bool const verIsRel) { +} + /*}}}*/ } diff --git a/apt-pkg/cacheset.h b/apt-pkg/cacheset.h index 3b1118bdc..411b31513 100644 --- a/apt-pkg/cacheset.h +++ b/apt-pkg/cacheset.h @@ -15,6 +15,7 @@ #include #include #include +#include #include #include @@ -23,8 +24,9 @@ class pkgCacheFile; namespace APT { -class PackageSet; -class VersionSet; +class PackageContainerInterface; +class VersionContainerInterface; + class CacheSetHelper { /*{{{*/ /** \class APT::CacheSetHelper Simple base class with a lot of virtual methods which can be overridden @@ -35,25 +37,28 @@ class CacheSetHelper { /*{{{*/ printed out. */ public: /*{{{*/ - CacheSetHelper(bool const &ShowError = true, + CacheSetHelper(bool const ShowError = true, GlobalError::MsgType ErrorType = GlobalError::ERROR) : ShowError(ShowError), ErrorType(ErrorType) {}; virtual ~CacheSetHelper() {}; - virtual void showTaskSelection(PackageSet const &pkgset, std::string const &pattern) {}; - virtual void showRegExSelection(PackageSet const &pkgset, std::string const &pattern) {}; + virtual void showTaskSelection(pkgCache::PkgIterator const &pkg, std::string const &pattern); + virtual void showRegExSelection(pkgCache::PkgIterator const &pkg, std::string const &pattern); virtual void showSelectedVersion(pkgCache::PkgIterator const &Pkg, pkgCache::VerIterator const Ver, - std::string const &ver, bool const &verIsRel) {}; + std::string const &ver, bool const verIsRel); - virtual pkgCache::PkgIterator canNotFindPkgName(pkgCacheFile &Cache, std::string const &str); - virtual PackageSet canNotFindTask(pkgCacheFile &Cache, std::string pattern); - virtual PackageSet canNotFindRegEx(pkgCacheFile &Cache, std::string pattern); - virtual PackageSet canNotFindPackage(pkgCacheFile &Cache, std::string const &str); - virtual VersionSet canNotFindAllVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg); - virtual VersionSet canNotFindInstCandVer(pkgCacheFile &Cache, + virtual void canNotFindTask(PackageContainerInterface * const pci, pkgCacheFile &Cache, std::string pattern); + virtual void canNotFindRegEx(PackageContainerInterface * const pci, pkgCacheFile &Cache, std::string pattern); + virtual void canNotFindPackage(PackageContainerInterface * const pci, pkgCacheFile &Cache, std::string const &str); + + virtual void canNotFindAllVer(VersionContainerInterface * const vci, pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg); + virtual void canNotFindInstCandVer(VersionContainerInterface * const vci, pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg); - virtual VersionSet canNotFindCandInstVer(pkgCacheFile &Cache, + virtual void canNotFindCandInstVer(VersionContainerInterface * const vci, + pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg); + + virtual pkgCache::PkgIterator canNotFindPkgName(pkgCacheFile &Cache, std::string const &str); virtual pkgCache::VerIterator canNotFindNewestVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg); virtual pkgCache::VerIterator canNotFindCandidateVer(pkgCacheFile &Cache, @@ -62,7 +67,7 @@ public: /*{{{*/ pkgCache::PkgIterator const &Pkg); bool showErrors() const { return ShowError; }; - bool showErrors(bool const &newValue) { if (ShowError == newValue) return ShowError; else return ((ShowError = newValue) == false); }; + bool showErrors(bool const newValue) { if (ShowError == newValue) return ShowError; else return ((ShowError = newValue) == false); }; GlobalError::MsgType errorType() const { return ErrorType; }; GlobalError::MsgType errorType(GlobalError::MsgType const &newValue) { @@ -79,53 +84,117 @@ protected: bool ShowError; GlobalError::MsgType ErrorType; }; /*}}}*/ -class PackageSet : public std::set { /*{{{*/ -/** \class APT::PackageSet - - Simple wrapper around a std::set to provide a similar interface to - a set of packages as to the complete set of all packages in the - pkgCache. */ -public: /*{{{*/ - /** \brief smell like a pkgCache::PkgIterator */ - class const_iterator : public std::set::const_iterator {/*{{{*/ +class PackageContainerInterface { /*{{{*/ +/** \class PackageContainerInterface + + * Interface ensuring that all operations can be executed on the yet to + * define concrete PackageContainer - access to all methods is possible, + * but in general the wrappers provided by the PackageContainer template + * are nicer to use. + + * This class mostly protects use from the need to write all implementation + * of the methods working on containers in the template */ +public: + class const_iterator { /*{{{*/ public: - const_iterator(std::set::const_iterator x) : - std::set::const_iterator(x) {} - - operator pkgCache::PkgIterator(void) { return **this; } - - inline const char *Name() const {return (**this).Name(); } - inline std::string FullName(bool const &Pretty) const { return (**this).FullName(Pretty); } - inline std::string FullName() const { return (**this).FullName(); } - inline const char *Section() const {return (**this).Section(); } - inline bool Purge() const {return (**this).Purge(); } - inline const char *Arch() const {return (**this).Arch(); } - inline pkgCache::GrpIterator Group() const { return (**this).Group(); } - inline pkgCache::VerIterator VersionList() const { return (**this).VersionList(); } - inline pkgCache::VerIterator CurrentVer() const { return (**this).CurrentVer(); } - inline pkgCache::DepIterator RevDependsList() const { return (**this).RevDependsList(); } - inline pkgCache::PrvIterator ProvidesList() const { return (**this).ProvidesList(); } - inline pkgCache::PkgIterator::OkState State() const { return (**this).State(); } - inline const char *CandVersion() const { return (**this).CandVersion(); } - inline const char *CurVersion() const { return (**this).CurVersion(); } - inline pkgCache *Cache() const { return (**this).Cache(); }; - inline unsigned long Index() const {return (**this).Index();}; + virtual pkgCache::PkgIterator getPkg() const = 0; + operator pkgCache::PkgIterator(void) const { return getPkg(); } + + inline const char *Name() const {return getPkg().Name(); } + inline std::string FullName(bool const Pretty) const { return getPkg().FullName(Pretty); } + inline std::string FullName() const { return getPkg().FullName(); } + inline const char *Section() const {return getPkg().Section(); } + inline bool Purge() const {return getPkg().Purge(); } + inline const char *Arch() const {return getPkg().Arch(); } + inline pkgCache::GrpIterator Group() const { return getPkg().Group(); } + inline pkgCache::VerIterator VersionList() const { return getPkg().VersionList(); } + inline pkgCache::VerIterator CurrentVer() const { return getPkg().CurrentVer(); } + inline pkgCache::DepIterator RevDependsList() const { return getPkg().RevDependsList(); } + inline pkgCache::PrvIterator ProvidesList() const { return getPkg().ProvidesList(); } + inline pkgCache::PkgIterator::OkState State() const { return getPkg().State(); } + inline const char *CandVersion() const { return getPkg().CandVersion(); } + inline const char *CurVersion() const { return getPkg().CurVersion(); } + inline pkgCache *Cache() const { return getPkg().Cache(); }; + inline unsigned long Index() const {return getPkg().Index();}; // we have only valid iterators here inline bool end() const { return false; }; - friend std::ostream& operator<<(std::ostream& out, const_iterator i) { return operator<<(out, (*i)); } + inline pkgCache::Package const * operator->() const {return &*getPkg();}; + }; + /*}}}*/ + + virtual bool insert(pkgCache::PkgIterator const &P) = 0; + virtual bool empty() const = 0; + virtual void clear() = 0; + + enum Constructor { UNKNOWN, REGEX, TASK }; + virtual void setConstructor(Constructor const &con) = 0; + virtual Constructor getConstructor() const = 0; + + static bool FromTask(PackageContainerInterface * const pci, pkgCacheFile &Cache, std::string pattern, CacheSetHelper &helper); + static bool FromRegEx(PackageContainerInterface * const pci, pkgCacheFile &Cache, std::string pattern, CacheSetHelper &helper); + static pkgCache::PkgIterator FromName(pkgCacheFile &Cache, std::string const &pattern, CacheSetHelper &helper); + static bool FromString(PackageContainerInterface * const pci, pkgCacheFile &Cache, std::string const &pattern, CacheSetHelper &helper); + static bool FromCommandLine(PackageContainerInterface * const pci, pkgCacheFile &Cache, const char **cmdline, CacheSetHelper &helper); + + struct Modifier { + enum Position { NONE, PREFIX, POSTFIX }; + unsigned short ID; + const char * const Alias; + Position Pos; + Modifier (unsigned short const &id, const char * const alias, Position const &pos) : ID(id), Alias(alias), Pos(pos) {}; + }; + + static bool FromModifierCommandLine(unsigned short &modID, PackageContainerInterface * const pci, + pkgCacheFile &Cache, const char * cmdline, + std::list const &mods, CacheSetHelper &helper); +}; + /*}}}*/ +template class PackageContainer : public PackageContainerInterface {/*{{{*/ +/** \class APT::PackageContainer - inline pkgCache::Package const * operator->() const { - return &***this; - }; + Simple wrapper around a container class like std::set to provide a similar + interface to a set of packages as to the complete set of all packages in the + pkgCache. */ + Container _cont; +public: /*{{{*/ + /** \brief smell like a pkgCache::PkgIterator */ + class const_iterator : public PackageContainerInterface::const_iterator, + public std::iterator {/*{{{*/ + typename Container::const_iterator _iter; + public: + const_iterator(typename Container::const_iterator i) : _iter(i) {} + pkgCache::PkgIterator getPkg(void) const { return *_iter; } + inline pkgCache::PkgIterator operator*(void) const { return *_iter; }; + operator typename Container::const_iterator(void) const { return _iter; } + inline void operator++(void) { ++_iter; }; + inline bool operator!=(const_iterator const &i) const { return _iter != i._iter; }; + inline bool operator==(const_iterator const &i) const { return _iter == i._iter; }; + friend std::ostream& operator<<(std::ostream& out, const_iterator i) { return operator<<(out, *i); } }; - // 103. set::iterator is required to be modifiable, but this allows modification of keys - typedef APT::PackageSet::const_iterator iterator; + // we are not going to allow modify our pkgiterators (it doesn't make sense)… + typedef APT::PackageContainer::const_iterator iterator; /*}}}*/ - using std::set::insert; - inline void insert(pkgCache::PkgIterator const &P) { if (P.end() == false) std::set::insert(P); }; - inline void insert(PackageSet const &pkgset) { insert(pkgset.begin(), pkgset.end()); }; + bool insert(pkgCache::PkgIterator const &P) { if (P.end() == true) return false; _cont.insert(P); return true; }; + template void insert(PackageContainer const &pkgcont) { _cont.insert((typename Cont::const_iterator)pkgcont.begin(), (typename Cont::const_iterator)pkgcont.end()); }; + void insert(const_iterator begin, const_iterator end) { _cont.insert(begin, end); }; + bool empty() const { return _cont.empty(); }; + void clear() { return _cont.clear(); }; + void erase(iterator position) { _cont.erase((typename Container::const_iterator)position); }; + size_t erase(const pkgCache::PkgIterator x) { return _cont.erase(x); }; + void erase(iterator first, iterator last) { _cont.erase(first, last); }; + size_t size() const { return _cont.size(); }; + + const_iterator begin() const { return const_iterator(_cont.begin()); }; + const_iterator end() const { return const_iterator(_cont.end()); }; + const_iterator find(pkgCache::PkgIterator const &P) const { return const_iterator(_cont.find(P)); }; + + void setConstructor(Constructor const &by) { ConstructedBy = by; }; + Constructor getConstructor() const { return ConstructedBy; }; + + PackageContainer() : ConstructedBy(UNKNOWN) {}; + PackageContainer(Constructor const &by) : ConstructedBy(by) {}; /** \brief returns all packages in the cache who belong to the given task @@ -135,8 +204,12 @@ public: /*{{{*/ \param Cache the packages are in \param pattern name of the task \param helper responsible for error and message handling */ - static APT::PackageSet FromTask(pkgCacheFile &Cache, std::string pattern, CacheSetHelper &helper); - static APT::PackageSet FromTask(pkgCacheFile &Cache, std::string const &pattern) { + static PackageContainer FromTask(pkgCacheFile &Cache, std::string const &pattern, CacheSetHelper &helper) { + PackageContainer cont(TASK); + PackageContainerInterface::FromTask(&cont, Cache, pattern, helper); + return cont; + } + static PackageContainer FromTask(pkgCacheFile &Cache, std::string const &pattern) { CacheSetHelper helper; return FromTask(Cache, pattern, helper); } @@ -149,32 +222,43 @@ public: /*{{{*/ \param Cache the packages are in \param pattern regular expression for package names \param helper responsible for error and message handling */ - static APT::PackageSet FromRegEx(pkgCacheFile &Cache, std::string pattern, CacheSetHelper &helper); - static APT::PackageSet FromRegEx(pkgCacheFile &Cache, std::string const &pattern) { + static PackageContainer FromRegEx(pkgCacheFile &Cache, std::string pattern, CacheSetHelper &helper) { + PackageContainer cont(REGEX); + PackageContainerInterface::FromRegEx(&cont, Cache, pattern, helper); + return cont; + } + + static PackageContainer FromRegEx(pkgCacheFile &Cache, std::string const &pattern) { CacheSetHelper helper; return FromRegEx(Cache, pattern, helper); } - /** \brief returns all packages specified by a string + /** \brief returns a package specified by a string - \param Cache the packages are in - \param string String the package name(s) should be extracted from + \param Cache the package is in + \param pattern String the package name should be extracted from \param helper responsible for error and message handling */ - static APT::PackageSet FromString(pkgCacheFile &Cache, std::string const &string, CacheSetHelper &helper); - static APT::PackageSet FromString(pkgCacheFile &Cache, std::string const &string) { + static pkgCache::PkgIterator FromName(pkgCacheFile &Cache, std::string const &pattern, CacheSetHelper &helper) { + return PackageContainerInterface::FromName(Cache, pattern, helper); + } + static pkgCache::PkgIterator FromName(pkgCacheFile &Cache, std::string const &pattern) { CacheSetHelper helper; - return FromString(Cache, string, helper); + return PackageContainerInterface::FromName(Cache, pattern, helper); } - /** \brief returns a package specified by a string + /** \brief returns all packages specified by a string - \param Cache the package is in - \param string String the package name should be extracted from + \param Cache the packages are in + \param pattern String the package name(s) should be extracted from \param helper responsible for error and message handling */ - static pkgCache::PkgIterator FromName(pkgCacheFile &Cache, std::string const &string, CacheSetHelper &helper); - static pkgCache::PkgIterator FromName(pkgCacheFile &Cache, std::string const &string) { + static PackageContainer FromString(pkgCacheFile &Cache, std::string const &pattern, CacheSetHelper &helper) { + PackageContainer cont; + PackageContainerInterface::FromString(&cont, Cache, pattern, helper); + return cont; + } + static PackageContainer FromString(pkgCacheFile &Cache, std::string const &pattern) { CacheSetHelper helper; - return FromName(Cache, string, helper); + return FromString(Cache, pattern, helper); } /** \brief returns all packages specified on the commandline @@ -184,20 +268,16 @@ public: /*{{{*/ \param Cache the packages are in \param cmdline Command line the package names should be extracted from \param helper responsible for error and message handling */ - static APT::PackageSet FromCommandLine(pkgCacheFile &Cache, const char **cmdline, CacheSetHelper &helper); - static APT::PackageSet FromCommandLine(pkgCacheFile &Cache, const char **cmdline) { + static PackageContainer FromCommandLine(pkgCacheFile &Cache, const char **cmdline, CacheSetHelper &helper) { + PackageContainer cont; + PackageContainerInterface::FromCommandLine(&cont, Cache, cmdline, helper); + return cont; + } + static PackageContainer FromCommandLine(pkgCacheFile &Cache, const char **cmdline) { CacheSetHelper helper; return FromCommandLine(Cache, cmdline, helper); } - struct Modifier { - enum Position { NONE, PREFIX, POSTFIX }; - unsigned short ID; - const char * const Alias; - Position Pos; - Modifier (unsigned short const &id, const char * const alias, Position const &pos) : ID(id), Alias(alias), Pos(pos) {}; - }; - /** \brief group packages by a action modifiers At some point it is needed to get from the same commandline @@ -209,76 +289,75 @@ public: /*{{{*/ \param mods list of modifiers the method should accept \param fallback the default modifier group for a package \param helper responsible for error and message handling */ - static std::map GroupedFromCommandLine( - pkgCacheFile &Cache, const char **cmdline, - std::list const &mods, - unsigned short const &fallback, CacheSetHelper &helper); - static std::map GroupedFromCommandLine( - pkgCacheFile &Cache, const char **cmdline, - std::list const &mods, - unsigned short const &fallback) { + static std::map GroupedFromCommandLine( + pkgCacheFile &Cache, + const char **cmdline, + std::list const &mods, + unsigned short const &fallback, + CacheSetHelper &helper) { + std::map pkgsets; + for (const char **I = cmdline; *I != 0; ++I) { + unsigned short modID = fallback; + PackageContainer pkgset; + PackageContainerInterface::FromModifierCommandLine(modID, &pkgset, Cache, *I, mods, helper); + pkgsets[modID].insert(pkgset); + } + return pkgsets; + } + static std::map GroupedFromCommandLine( + pkgCacheFile &Cache, + const char **cmdline, + std::list const &mods, + unsigned short const &fallback) { CacheSetHelper helper; return GroupedFromCommandLine(Cache, cmdline, mods, fallback, helper); } - - enum Constructor { UNKNOWN, REGEX, TASK }; - Constructor getConstructor() const { return ConstructedBy; }; - - PackageSet() : ConstructedBy(UNKNOWN) {}; - PackageSet(Constructor const &by) : ConstructedBy(by) {}; /*}}}*/ private: /*{{{*/ Constructor ConstructedBy; /*}}}*/ }; /*}}}*/ -class VersionSet : public std::set { /*{{{*/ -/** \class APT::VersionSet +typedef PackageContainer > PackageSet; - Simple wrapper around a std::set to provide a similar interface to - a set of versions as to the complete set of all versions in the - pkgCache. */ -public: /*{{{*/ +class VersionContainerInterface { /*{{{*/ +/** \class APT::VersionContainerInterface + + Same as APT::PackageContainerInterface, just for Versions */ +public: /** \brief smell like a pkgCache::VerIterator */ - class const_iterator : public std::set::const_iterator {/*{{{*/ + class const_iterator { /*{{{*/ public: - const_iterator(std::set::const_iterator x) : - std::set::const_iterator(x) {} - - operator pkgCache::VerIterator(void) { return **this; } - - inline pkgCache *Cache() const { return (**this).Cache(); }; - inline unsigned long Index() const {return (**this).Index();}; + virtual pkgCache::VerIterator getVer() const = 0; + operator pkgCache::VerIterator(void) { return getVer(); } + + inline pkgCache *Cache() const { return getVer().Cache(); }; + inline unsigned long Index() const {return getVer().Index();}; + inline int CompareVer(const pkgCache::VerIterator &B) const { return getVer().CompareVer(B); }; + inline const char *VerStr() const { return getVer().VerStr(); }; + inline const char *Section() const { return getVer().Section(); }; + inline const char *Arch() const { return getVer().Arch(); }; + inline pkgCache::PkgIterator ParentPkg() const { return getVer().ParentPkg(); }; + inline pkgCache::DescIterator DescriptionList() const { return getVer().DescriptionList(); }; + inline pkgCache::DescIterator TranslatedDescription() const { return getVer().TranslatedDescription(); }; + inline pkgCache::DepIterator DependsList() const { return getVer().DependsList(); }; + inline pkgCache::PrvIterator ProvidesList() const { return getVer().ProvidesList(); }; + inline pkgCache::VerFileIterator FileList() const { return getVer().FileList(); }; + inline bool Downloadable() const { return getVer().Downloadable(); }; + inline const char *PriorityType() const { return getVer().PriorityType(); }; + inline std::string RelStr() const { return getVer().RelStr(); }; + inline bool Automatic() const { return getVer().Automatic(); }; + inline pkgCache::VerFileIterator NewestFile() const { return getVer().NewestFile(); }; // we have only valid iterators here inline bool end() const { return false; }; - inline pkgCache::Version const * operator->() const { - return &***this; - }; - - inline int CompareVer(const pkgCache::VerIterator &B) const { return (**this).CompareVer(B); }; - inline const char *VerStr() const { return (**this).VerStr(); }; - inline const char *Section() const { return (**this).Section(); }; - inline const char *Arch() const { return (**this).Arch(); }; - inline pkgCache::PkgIterator ParentPkg() const { return (**this).ParentPkg(); }; - inline pkgCache::DescIterator DescriptionList() const { return (**this).DescriptionList(); }; - inline pkgCache::DescIterator TranslatedDescription() const { return (**this).TranslatedDescription(); }; - inline pkgCache::DepIterator DependsList() const { return (**this).DependsList(); }; - inline pkgCache::PrvIterator ProvidesList() const { return (**this).ProvidesList(); }; - inline pkgCache::VerFileIterator FileList() const { return (**this).FileList(); }; - inline bool Downloadable() const { return (**this).Downloadable(); }; - inline const char *PriorityType() const { return (**this).PriorityType(); }; - inline std::string RelStr() const { return (**this).RelStr(); }; - inline bool Automatic() const { return (**this).Automatic(); }; - inline pkgCache::VerFileIterator NewestFile() const { return (**this).NewestFile(); }; + inline pkgCache::Version const * operator->() const { return &*getVer(); }; }; /*}}}*/ - // 103. set::iterator is required to be modifiable, but this allows modification of keys - typedef APT::VersionSet::const_iterator iterator; - using std::set::insert; - inline void insert(pkgCache::VerIterator const &V) { if (V.end() == false) std::set::insert(V); }; - inline void insert(VersionSet const &verset) { insert(verset.begin(), verset.end()); }; + virtual bool insert(pkgCache::VerIterator const &V) = 0; + virtual bool empty() const = 0; + virtual void clear() = 0; /** \brief specifies which version(s) will be returned if non is given */ enum Version { @@ -298,6 +377,93 @@ public: /*{{{*/ NEWEST }; + struct Modifier { + enum Position { NONE, PREFIX, POSTFIX }; + unsigned short ID; + const char * const Alias; + Position Pos; + Version SelectVersion; + Modifier (unsigned short const &id, const char * const alias, Position const &pos, + Version const &select) : ID(id), Alias(alias), Pos(pos), + SelectVersion(select) {}; + }; + + static bool FromCommandLine(VersionContainerInterface * const vci, pkgCacheFile &Cache, + const char **cmdline, Version const &fallback, + CacheSetHelper &helper); + + static bool FromString(VersionContainerInterface * const vci, pkgCacheFile &Cache, + std::string pkg, Version const &fallback, CacheSetHelper &helper, + bool const onlyFromName = false); + + static bool FromPackage(VersionContainerInterface * const vci, pkgCacheFile &Cache, + pkgCache::PkgIterator const &P, Version const &fallback, + CacheSetHelper &helper); + + static bool FromModifierCommandLine(unsigned short &modID, + VersionContainerInterface * const vci, + pkgCacheFile &Cache, const char * cmdline, + std::list const &mods, + CacheSetHelper &helper); + +protected: /*{{{*/ + + /** \brief returns the candidate version of the package + + \param Cache to be used to query for information + \param Pkg we want the candidate version from this package */ + static pkgCache::VerIterator getCandidateVer(pkgCacheFile &Cache, + pkgCache::PkgIterator const &Pkg, CacheSetHelper &helper); + + /** \brief returns the installed version of the package + + \param Cache to be used to query for information + \param Pkg we want the installed version from this package */ + static pkgCache::VerIterator getInstalledVer(pkgCacheFile &Cache, + pkgCache::PkgIterator const &Pkg, CacheSetHelper &helper); + /*}}}*/ +}; + /*}}}*/ +template class VersionContainer : public VersionContainerInterface {/*{{{*/ +/** \class APT::PackageContainer + + Simple wrapper around a container class like std::set to provide a similar + interface to a set of versions as to the complete set of all versions in the + pkgCache. */ + Container _cont; +public: /*{{{*/ + /** \brief smell like a pkgCache::VerIterator */ + class const_iterator : public VersionContainerInterface::const_iterator, + public std::iterator {/*{{{*/ + typename Container::const_iterator _iter; + public: + const_iterator(typename Container::const_iterator i) : _iter(i) {} + pkgCache::VerIterator getVer(void) const { return *_iter; } + inline pkgCache::VerIterator operator*(void) const { return *_iter; }; + operator typename Container::const_iterator(void) const { return _iter; } + inline void operator++(void) { ++_iter; }; + inline bool operator!=(const_iterator const &i) const { return _iter != i._iter; }; + inline bool operator==(const_iterator const &i) const { return _iter == i._iter; }; + friend std::ostream& operator<<(std::ostream& out, const_iterator i) { return operator<<(out, *i); } + }; + // we are not going to allow modify our veriterators (it doesn't make sense)… + typedef APT::VersionContainer::const_iterator iterator; + /*}}}*/ + + bool insert(pkgCache::VerIterator const &V) { if (V.end() == true) return false; _cont.insert(V); return true; }; + template void insert(VersionContainer const &vercont) { _cont.insert((typename Cont::const_iterator)vercont.begin(), (typename Cont::const_iterator)vercont.end()); }; + void insert(const_iterator begin, const_iterator end) { _cont.insert(begin, end); }; + bool empty() const { return _cont.empty(); }; + void clear() { return _cont.clear(); }; + void erase(iterator position) { _cont.erase((typename Container::const_iterator)position); }; + size_t erase(const pkgCache::PkgIterator x) { return _cont.erase(x); }; + void erase(iterator first, iterator last) { _cont.erase(first, last); }; + size_t size() const { return _cont.size(); }; + + const_iterator begin() const { return const_iterator(_cont.begin()); }; + const_iterator end() const { return const_iterator(_cont.end()); }; + const_iterator find(pkgCache::VerIterator const &V) const { return const_iterator(_cont.find(V)); }; + /** \brief returns all versions specified on the commandline Get all versions from the commandline, uses given default version if @@ -305,26 +471,34 @@ public: /*{{{*/ \param Cache the packages and versions are in \param cmdline Command line the versions should be extracted from \param helper responsible for error and message handling */ - static APT::VersionSet FromCommandLine(pkgCacheFile &Cache, const char **cmdline, - APT::VersionSet::Version const &fallback, CacheSetHelper &helper); - static APT::VersionSet FromCommandLine(pkgCacheFile &Cache, const char **cmdline, - APT::VersionSet::Version const &fallback) { + static VersionContainer FromCommandLine(pkgCacheFile &Cache, const char **cmdline, + Version const &fallback, CacheSetHelper &helper) { + VersionContainer vercon; + VersionContainerInterface::FromCommandLine(&vercon, Cache, cmdline, fallback, helper); + return vercon; + } + static VersionContainer FromCommandLine(pkgCacheFile &Cache, const char **cmdline, + Version const &fallback) { CacheSetHelper helper; return FromCommandLine(Cache, cmdline, fallback, helper); } - static APT::VersionSet FromCommandLine(pkgCacheFile &Cache, const char **cmdline) { + static VersionContainer FromCommandLine(pkgCacheFile &Cache, const char **cmdline) { return FromCommandLine(Cache, cmdline, CANDINST); } - static APT::VersionSet FromString(pkgCacheFile &Cache, std::string pkg, - APT::VersionSet::Version const &fallback, CacheSetHelper &helper, - bool const &onlyFromName = false); - static APT::VersionSet FromString(pkgCacheFile &Cache, std::string pkg, - APT::VersionSet::Version const &fallback) { + static VersionContainer FromString(pkgCacheFile &Cache, std::string const &pkg, + Version const &fallback, CacheSetHelper &helper, + bool const onlyFromName = false) { + VersionContainer vercon; + VersionContainerInterface::FromString(&vercon, Cache, pkg, fallback, helper); + return vercon; + } + static VersionContainer FromString(pkgCacheFile &Cache, std::string pkg, + Version const &fallback) { CacheSetHelper helper; return FromString(Cache, pkg, fallback, helper); } - static APT::VersionSet FromString(pkgCacheFile &Cache, std::string pkg) { + static VersionContainer FromString(pkgCacheFile &Cache, std::string pkg) { return FromString(Cache, pkg, CANDINST); } @@ -334,57 +508,47 @@ public: /*{{{*/ \param P the package in question \param fallback the version(s) you want to get \param helper the helper used for display and error handling */ - static APT::VersionSet FromPackage(pkgCacheFile &Cache, pkgCache::PkgIterator const &P, - VersionSet::Version const &fallback, CacheSetHelper &helper); - static APT::VersionSet FromPackage(pkgCacheFile &Cache, pkgCache::PkgIterator const &P, - APT::VersionSet::Version const &fallback) { + static VersionContainer FromPackage(pkgCacheFile &Cache, pkgCache::PkgIterator const &P, + Version const &fallback, CacheSetHelper &helper) { + VersionContainer vercon; + VersionContainerInterface::FromPackage(&vercon, Cache, P, fallback, helper); + return vercon; + } + static VersionContainer FromPackage(pkgCacheFile &Cache, pkgCache::PkgIterator const &P, + Version const &fallback) { CacheSetHelper helper; return FromPackage(Cache, P, fallback, helper); } - static APT::VersionSet FromPackage(pkgCacheFile &Cache, pkgCache::PkgIterator const &P) { + static VersionContainer FromPackage(pkgCacheFile &Cache, pkgCache::PkgIterator const &P) { return FromPackage(Cache, P, CANDINST); } - struct Modifier { - enum Position { NONE, PREFIX, POSTFIX }; - unsigned short ID; - const char * const Alias; - Position Pos; - VersionSet::Version SelectVersion; - Modifier (unsigned short const &id, const char * const alias, Position const &pos, - VersionSet::Version const &select) : ID(id), Alias(alias), Pos(pos), - SelectVersion(select) {}; - }; + static std::map GroupedFromCommandLine( + pkgCacheFile &Cache, + const char **cmdline, + std::list const &mods, + unsigned short const fallback, + CacheSetHelper &helper) { + std::map versets; + for (const char **I = cmdline; *I != 0; ++I) { + unsigned short modID = fallback; + VersionContainer verset; + VersionContainerInterface::FromModifierCommandLine(modID, &verset, Cache, *I, mods, helper); + versets[modID].insert(verset); + } + return versets; - static std::map GroupedFromCommandLine( - pkgCacheFile &Cache, const char **cmdline, - std::list const &mods, - unsigned short const &fallback, CacheSetHelper &helper); - static std::map GroupedFromCommandLine( + } + static std::map GroupedFromCommandLine( pkgCacheFile &Cache, const char **cmdline, - std::list const &mods, - unsigned short const &fallback) { + std::list const &mods, + unsigned short const fallback) { CacheSetHelper helper; return GroupedFromCommandLine(Cache, cmdline, mods, fallback, helper); } /*}}}*/ -protected: /*{{{*/ - - /** \brief returns the candidate version of the package - - \param Cache to be used to query for information - \param Pkg we want the candidate version from this package */ - static pkgCache::VerIterator getCandidateVer(pkgCacheFile &Cache, - pkgCache::PkgIterator const &Pkg, CacheSetHelper &helper); - - /** \brief returns the installed version of the package - - \param Cache to be used to query for information - \param Pkg we want the installed version from this package */ - static pkgCache::VerIterator getInstalledVer(pkgCacheFile &Cache, - pkgCache::PkgIterator const &Pkg, CacheSetHelper &helper); - /*}}}*/ }; /*}}}*/ +typedef VersionContainer > VersionSet; } #endif diff --git a/apt-pkg/edsp.h b/apt-pkg/edsp.h index c14309422..07bbbdd03 100644 --- a/apt-pkg/edsp.h +++ b/apt-pkg/edsp.h @@ -10,13 +10,11 @@ #define PKGLIB_EDSP_H #include +#include #include #include -namespace APT { - class PackageSet; -}; class pkgDepCache; class OpProgress; diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index 82a31c9b1..ee3416ffb 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -65,12 +65,12 @@ public: return CacheSetHelper::canNotFindNewestVer(Cache, Pkg); } - virtual APT::VersionSet canNotFindAllVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg) { + virtual void canNotFindAllVer(APT::VersionContainerInterface * vci, pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg) { virtualPkgs.insert(Pkg); - return CacheSetHelper::canNotFindAllVer(Cache, Pkg); + CacheSetHelper::canNotFindAllVer(vci, Cache, Pkg); } - CacheSetHelperVirtuals(bool const &ShowErrors = true, GlobalError::MsgType const &ErrorType = GlobalError::NOTICE) : CacheSetHelper(ShowErrors, ErrorType) {} + CacheSetHelperVirtuals(bool const ShowErrors = true, GlobalError::MsgType const &ErrorType = GlobalError::NOTICE) : CacheSetHelper(ShowErrors, ErrorType) {} }; /*}}}*/ // LocalitySort - Sort a version list by package file locality /*{{{*/ @@ -108,7 +108,7 @@ void LocalitySort(pkgCache::DescFile **begin, // UnMet - Show unmet dependencies /*{{{*/ // --------------------------------------------------------------------- /* */ -bool ShowUnMet(pkgCache::VerIterator const &V, bool const &Important) +bool ShowUnMet(pkgCache::VerIterator const &V, bool const Important) { bool Header = false; for (pkgCache::DepIterator D = V.DependsList(); D.end() == false;) diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 1925dea87..5ead83ddf 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -628,20 +628,18 @@ public: explicitlyNamed = true; } - virtual void showTaskSelection(APT::PackageSet const &pkgset, string const &pattern) { - for (APT::PackageSet::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg) - ioprintf(out, _("Note, selecting '%s' for task '%s'\n"), - Pkg.FullName(true).c_str(), pattern.c_str()); + virtual void showTaskSelection(pkgCache::PkgIterator const &Pkg, string const &pattern) { + ioprintf(out, _("Note, selecting '%s' for task '%s'\n"), + Pkg.FullName(true).c_str(), pattern.c_str()); explicitlyNamed = false; } - virtual void showRegExSelection(APT::PackageSet const &pkgset, string const &pattern) { - for (APT::PackageSet::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg) - ioprintf(out, _("Note, selecting '%s' for regex '%s'\n"), - Pkg.FullName(true).c_str(), pattern.c_str()); + virtual void showRegExSelection(pkgCache::PkgIterator const &Pkg, string const &pattern) { + ioprintf(out, _("Note, selecting '%s' for regex '%s'\n"), + Pkg.FullName(true).c_str(), pattern.c_str()); explicitlyNamed = false; } virtual void showSelectedVersion(pkgCache::PkgIterator const &Pkg, pkgCache::VerIterator const Ver, - string const &ver, bool const &verIsRel) { + string const &ver, bool const verIsRel) { if (ver == Ver.VerStr()) return; selectedByRelease.push_back(make_pair(Ver, ver)); @@ -707,7 +705,7 @@ public: APT::VersionSet const verset = tryVirtualPackage(Cache, Pkg, APT::VersionSet::CANDIDATE); if (verset.empty() == false) return *(verset.begin()); - if (ShowError == true) { + else if (ShowError == true) { _error->Error(_("Package '%s' has no installation candidate"),Pkg.FullName(true).c_str()); virtualPkgs.insert(Pkg); } @@ -769,7 +767,7 @@ struct TryToInstall { unsigned long AutoMarkChanged; APT::PackageSet doAutoInstallLater; - TryToInstall(pkgCacheFile &Cache, pkgProblemResolver *PM, bool const &FixBroken) : Cache(&Cache), Fix(PM), + TryToInstall(pkgCacheFile &Cache, pkgProblemResolver *PM, bool const FixBroken) : Cache(&Cache), Fix(PM), FixBroken(FixBroken), AutoMarkChanged(0) {}; void operator() (pkgCache::VerIterator const &Ver) { diff --git a/debian/changelog b/debian/changelog index df50eefbd..95ad73681 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,8 +9,11 @@ apt (0.8.16~exp8) experimental; urgency=low - use a pointer-union to peace gcc strict-aliasing warning * apt-pkg/deb/deblistparser.cc: - M-A: foreign packages provide for other archs, too + * apt-pkg/cacheset.cc: + - make the cachesets real containers which can embedding any container + to be able to use the same interface regardless of set or list usage - -- David Kalnischkies Thu, 03 Nov 2011 09:40:29 -0500 + -- David Kalnischkies Wed, 09 Nov 2011 17:21:02 +0100 apt (0.8.16~exp7) experimental; urgency=low -- cgit v1.2.3-70-g09d2 From c4cca79156ef5651e90772bae5f4aa11f669907d Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 11 Nov 2011 16:03:40 +0100 Subject: - provide a {Package,Version}List similar to {Package,Version}Set * cmdline/apt-{get,cache,mark}.cc: - use Lists instead of Sets if input order should be preserved for commands accepting lists of packages, e.g. policy (Closes: #625960) --- apt-pkg/cacheset.h | 110 +++++++++++++++++++++++++++--- cmdline/apt-cache.cc | 28 ++++---- cmdline/apt-get.cc | 14 ++-- cmdline/apt-mark.cc | 16 ++--- debian/changelog | 6 +- test/integration/Packages-pdiff-usage-new | 26 +++---- 6 files changed, 146 insertions(+), 54 deletions(-) diff --git a/apt-pkg/cacheset.h b/apt-pkg/cacheset.h index 411b31513..a23659efb 100644 --- a/apt-pkg/cacheset.h +++ b/apt-pkg/cacheset.h @@ -14,6 +14,7 @@ #include #include #include +#include #include #include @@ -159,8 +160,8 @@ template class PackageContainer : public PackageContainerInterf Container _cont; public: /*{{{*/ /** \brief smell like a pkgCache::PkgIterator */ - class const_iterator : public PackageContainerInterface::const_iterator, - public std::iterator {/*{{{*/ + class const_iterator : public PackageContainerInterface::const_iterator,/*{{{*/ + public std::iterator { typename Container::const_iterator _iter; public: const_iterator(typename Container::const_iterator i) : _iter(i) {} @@ -172,22 +173,37 @@ public: /*{{{*/ inline bool operator==(const_iterator const &i) const { return _iter == i._iter; }; friend std::ostream& operator<<(std::ostream& out, const_iterator i) { return operator<<(out, *i); } }; - // we are not going to allow modify our pkgiterators (it doesn't make sense)… - typedef APT::PackageContainer::const_iterator iterator; + class iterator : public PackageContainerInterface::const_iterator, + public std::iterator { + typename Container::iterator _iter; + public: + iterator(typename Container::iterator i) : _iter(i) {} + pkgCache::PkgIterator getPkg(void) const { return *_iter; } + inline pkgCache::PkgIterator operator*(void) const { return *_iter; }; + operator typename Container::iterator(void) const { return _iter; } + operator typename PackageContainer::const_iterator() { return PackageContainer::const_iterator(_iter); } + inline void operator++(void) { ++_iter; }; + inline bool operator!=(iterator const &i) const { return _iter != i._iter; }; + inline bool operator==(iterator const &i) const { return _iter == i._iter; }; + friend std::ostream& operator<<(std::ostream& out, iterator i) { return operator<<(out, *i); } + }; /*}}}*/ bool insert(pkgCache::PkgIterator const &P) { if (P.end() == true) return false; _cont.insert(P); return true; }; template void insert(PackageContainer const &pkgcont) { _cont.insert((typename Cont::const_iterator)pkgcont.begin(), (typename Cont::const_iterator)pkgcont.end()); }; void insert(const_iterator begin, const_iterator end) { _cont.insert(begin, end); }; + bool empty() const { return _cont.empty(); }; void clear() { return _cont.clear(); }; - void erase(iterator position) { _cont.erase((typename Container::const_iterator)position); }; + void erase(iterator position) { _cont.erase((typename Container::iterator)position); }; size_t erase(const pkgCache::PkgIterator x) { return _cont.erase(x); }; void erase(iterator first, iterator last) { _cont.erase(first, last); }; size_t size() const { return _cont.size(); }; const_iterator begin() const { return const_iterator(_cont.begin()); }; const_iterator end() const { return const_iterator(_cont.end()); }; + iterator begin() { return iterator(_cont.begin()); }; + iterator end() { return iterator(_cont.end()); }; const_iterator find(pkgCache::PkgIterator const &P) const { return const_iterator(_cont.find(P)); }; void setConstructor(Constructor const &by) { ConstructedBy = by; }; @@ -318,7 +334,25 @@ private: /*{{{*/ Constructor ConstructedBy; /*}}}*/ }; /*}}}*/ + +template<> template void PackageContainer >::insert(PackageContainer const &pkgcont) { + for (typename PackageContainer::const_iterator p = pkgcont.begin(); p != pkgcont.end(); ++p) + _cont.push_back(*p); +}; +// these two are 'inline' as otherwise the linker has problems with seeing these untemplated +// specializations again and again - but we need to see them, so that library users can use them +template<> inline bool PackageContainer >::insert(pkgCache::PkgIterator const &P) { + if (P.end() == true) + return false; + _cont.push_back(P); + return true; +}; +template<> inline void PackageContainer >::insert(const_iterator begin, const_iterator end) { + for (const_iterator p = begin; p != end; ++p) + _cont.push_back(*p); +}; typedef PackageContainer > PackageSet; +typedef PackageContainer > PackageList; class VersionContainerInterface { /*{{{*/ /** \class APT::VersionContainerInterface @@ -406,6 +440,13 @@ public: std::list const &mods, CacheSetHelper &helper); + + static bool FromDependency(VersionContainerInterface * const vci, + pkgCacheFile &Cache, + pkgCache::DepIterator const &D, + Version const &selector, + CacheSetHelper &helper); + protected: /*{{{*/ /** \brief returns the candidate version of the package @@ -425,7 +466,7 @@ protected: /*{{{*/ }; /*}}}*/ template class VersionContainer : public VersionContainerInterface {/*{{{*/ -/** \class APT::PackageContainer +/** \class APT::VersionContainer Simple wrapper around a container class like std::set to provide a similar interface to a set of versions as to the complete set of all versions in the @@ -446,8 +487,20 @@ public: /*{{{*/ inline bool operator==(const_iterator const &i) const { return _iter == i._iter; }; friend std::ostream& operator<<(std::ostream& out, const_iterator i) { return operator<<(out, *i); } }; - // we are not going to allow modify our veriterators (it doesn't make sense)… - typedef APT::VersionContainer::const_iterator iterator; + class iterator : public VersionContainerInterface::const_iterator, + public std::iterator { + typename Container::iterator _iter; + public: + iterator(typename Container::iterator i) : _iter(i) {} + pkgCache::VerIterator getVer(void) const { return *_iter; } + inline pkgCache::VerIterator operator*(void) const { return *_iter; }; + operator typename Container::iterator(void) const { return _iter; } + operator typename VersionContainer::const_iterator() { return VersionContainer::const_iterator(_iter); } + inline void operator++(void) { ++_iter; }; + inline bool operator!=(iterator const &i) const { return _iter != i._iter; }; + inline bool operator==(iterator const &i) const { return _iter == i._iter; }; + friend std::ostream& operator<<(std::ostream& out, iterator i) { return operator<<(out, *i); } + }; /*}}}*/ bool insert(pkgCache::VerIterator const &V) { if (V.end() == true) return false; _cont.insert(V); return true; }; @@ -455,13 +508,15 @@ public: /*{{{*/ void insert(const_iterator begin, const_iterator end) { _cont.insert(begin, end); }; bool empty() const { return _cont.empty(); }; void clear() { return _cont.clear(); }; - void erase(iterator position) { _cont.erase((typename Container::const_iterator)position); }; - size_t erase(const pkgCache::PkgIterator x) { return _cont.erase(x); }; + void erase(iterator position) { _cont.erase((typename Container::iterator)position); }; + size_t erase(const pkgCache::VerIterator x) { return _cont.erase(x); }; void erase(iterator first, iterator last) { _cont.erase(first, last); }; size_t size() const { return _cont.size(); }; const_iterator begin() const { return const_iterator(_cont.begin()); }; const_iterator end() const { return const_iterator(_cont.end()); }; + iterator begin() { return iterator(_cont.begin()); }; + iterator end() { return iterator(_cont.end()); }; const_iterator find(pkgCache::VerIterator const &V) const { return const_iterator(_cont.find(V)); }; /** \brief returns all versions specified on the commandline @@ -520,7 +575,7 @@ public: /*{{{*/ return FromPackage(Cache, P, fallback, helper); } static VersionContainer FromPackage(pkgCacheFile &Cache, pkgCache::PkgIterator const &P) { - return FromPackage(Cache, P, CANDINST); + return FromPackage(Cache, P, CANDIDATE); } static std::map GroupedFromCommandLine( @@ -547,8 +602,41 @@ public: /*{{{*/ return GroupedFromCommandLine(Cache, cmdline, mods, fallback, helper); } + + static VersionContainer FromDependency(pkgCacheFile &Cache, pkgCache::DepIterator const &D, + Version const &selector, CacheSetHelper &helper) { + VersionContainer vercon; + VersionContainerInterface::FromDependency(&vercon, Cache, D, selector, helper); + return vercon; + } + static VersionContainer FromDependency(pkgCacheFile &Cache, pkgCache::DepIterator const &D, + Version const &selector) { + CacheSetHelper helper; + return FromPackage(Cache, D, selector, helper); + } + static VersionContainer FromDependency(pkgCacheFile &Cache, pkgCache::DepIterator const &D) { + return FromPackage(Cache, D, CANDIDATE); + } /*}}}*/ }; /*}}}*/ + +template<> template void VersionContainer >::insert(VersionContainer const &vercont) { + for (typename VersionContainer::const_iterator v = vercont.begin(); v != vercont.end(); ++v) + _cont.push_back(*v); +}; +// these two are 'inline' as otherwise the linker has problems with seeing these untemplated +// specializations again and again - but we need to see them, so that library users can use them +template<> inline bool VersionContainer >::insert(pkgCache::VerIterator const &V) { + if (V.end() == true) + return false; + _cont.push_back(V); + return true; +}; +template<> inline void VersionContainer >::insert(const_iterator begin, const_iterator end) { + for (const_iterator v = begin; v != end; ++v) + _cont.push_back(*v); +}; typedef VersionContainer > VersionSet; +typedef VersionContainer > VersionList; } #endif diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index ee3416ffb..65d7b0ccd 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -199,9 +199,9 @@ bool UnMet(CommandLine &CmdL) else { CacheSetHelperVirtuals helper(true, GlobalError::NOTICE); - APT::VersionSet verset = APT::VersionSet::FromCommandLine(CacheFile, CmdL.FileList + 1, - APT::VersionSet::CANDIDATE, helper); - for (APT::VersionSet::iterator V = verset.begin(); V != verset.end(); ++V) + APT::VersionList verset = APT::VersionList::FromCommandLine(CacheFile, CmdL.FileList + 1, + APT::VersionList::CANDIDATE, helper); + for (APT::VersionList::iterator V = verset.begin(); V != verset.end(); ++V) if (ShowUnMet(V, Important) == false) return false; } @@ -215,9 +215,9 @@ bool DumpPackage(CommandLine &CmdL) { pkgCacheFile CacheFile; APT::CacheSetHelper helper(true, GlobalError::NOTICE); - APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(CacheFile, CmdL.FileList + 1, helper); + APT::PackageList pkgset = APT::PackageList::FromCommandLine(CacheFile, CmdL.FileList + 1, helper); - for (APT::PackageSet::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg) + for (APT::PackageList::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg) { cout << "Package: " << Pkg.FullName(true) << endl; cout << "Versions: " << endl; @@ -588,7 +588,7 @@ bool ShowDepends(CommandLine &CmdL, bool const RevDepends) return false; CacheSetHelperVirtuals helper(false); - APT::VersionSet verset = APT::VersionSet::FromCommandLine(CacheFile, CmdL.FileList + 1, APT::VersionSet::CANDIDATE, helper); + APT::VersionList verset = APT::VersionList::FromCommandLine(CacheFile, CmdL.FileList + 1, APT::VersionList::CANDIDATE, helper); if (verset.empty() == true && helper.virtualPkgs.empty() == true) return _error->Error(_("No packages found")); std::vector Shown(Cache->Head().PackageCount); @@ -1365,10 +1365,10 @@ bool ShowPackage(CommandLine &CmdL) { pkgCacheFile CacheFile; CacheSetHelperVirtuals helper(true, GlobalError::NOTICE); - APT::VersionSet::Version const select = _config->FindB("APT::Cache::AllVersions", true) ? - APT::VersionSet::ALL : APT::VersionSet::CANDIDATE; - APT::VersionSet const verset = APT::VersionSet::FromCommandLine(CacheFile, CmdL.FileList + 1, select, helper); - for (APT::VersionSet::const_iterator Ver = verset.begin(); Ver != verset.end(); ++Ver) + APT::VersionList::Version const select = _config->FindB("APT::Cache::AllVersions", true) ? + APT::VersionList::ALL : APT::VersionList::CANDIDATE; + APT::VersionList const verset = APT::VersionList::FromCommandLine(CacheFile, CmdL.FileList + 1, select, helper); + for (APT::VersionList::const_iterator Ver = verset.begin(); Ver != verset.end(); ++Ver) if (DisplayRecord(CacheFile, Ver) == false) return false; @@ -1531,8 +1531,8 @@ bool Policy(CommandLine &CmdL) // Print out detailed information for each package APT::CacheSetHelper helper(true, GlobalError::NOTICE); - APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(CacheFile, CmdL.FileList + 1, helper); - for (APT::PackageSet::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg) + APT::PackageList pkgset = APT::PackageList::FromCommandLine(CacheFile, CmdL.FileList + 1, helper); + for (APT::PackageList::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg) { cout << Pkg.FullName(true) << ":" << endl; @@ -1608,8 +1608,8 @@ bool Madison(CommandLine &CmdL) for (const char **I = CmdL.FileList + 1; *I != 0; I++) { _error->PushToStack(); - APT::PackageSet pkgset = APT::PackageSet::FromString(CacheFile, *I, helper); - for (APT::PackageSet::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg) + APT::PackageList pkgset = APT::PackageList::FromString(CacheFile, *I, helper); + for (APT::PackageList::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg) { for (pkgCache::VerIterator V = Pkg.VersionList(); V.end() == false; ++V) { diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 5ead83ddf..763f0edad 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -2293,8 +2293,8 @@ bool DoDownload(CommandLine &CmdL) return false; APT::CacheSetHelper helper(c0out); - APT::VersionSet verset = APT::VersionSet::FromCommandLine(Cache, - CmdL.FileList + 1, APT::VersionSet::CANDIDATE, helper); + APT::VersionList verset = APT::VersionList::FromCommandLine(Cache, + CmdL.FileList + 1, APT::VersionList::CANDIDATE, helper); if (verset.empty() == true) return false; @@ -2306,7 +2306,7 @@ bool DoDownload(CommandLine &CmdL) pkgRecords Recs(Cache); pkgSourceList *SrcList = Cache.GetSourceList(); - for (APT::VersionSet::const_iterator Ver = verset.begin(); + for (APT::VersionList::const_iterator Ver = verset.begin(); Ver != verset.end(); ++Ver) { @@ -3165,14 +3165,14 @@ bool DoChangelog(CommandLine &CmdL) return false; APT::CacheSetHelper helper(c0out); - APT::VersionSet verset = APT::VersionSet::FromCommandLine(Cache, - CmdL.FileList + 1, APT::VersionSet::CANDIDATE, helper); + APT::VersionList verset = APT::VersionList::FromCommandLine(Cache, + CmdL.FileList + 1, APT::VersionList::CANDIDATE, helper); if (verset.empty() == true) return false; pkgAcquire Fetcher; if (_config->FindB("APT::Get::Print-URIs", false) == true) - for (APT::VersionSet::const_iterator Ver = verset.begin(); + for (APT::VersionList::const_iterator Ver = verset.begin(); Ver != verset.end(); ++Ver) return DownloadChangelog(Cache, Fetcher, Ver, ""); @@ -3195,7 +3195,7 @@ bool DoChangelog(CommandLine &CmdL) return _error->Errno("mkdtemp", "mkdtemp failed"); } - for (APT::VersionSet::const_iterator Ver = verset.begin(); + for (APT::VersionList::const_iterator Ver = verset.begin(); Ver != verset.end(); ++Ver) { diff --git a/cmdline/apt-mark.cc b/cmdline/apt-mark.cc index 339cbdf44..dbbef5013 100644 --- a/cmdline/apt-mark.cc +++ b/cmdline/apt-mark.cc @@ -34,14 +34,14 @@ bool DoAuto(CommandLine &CmdL) if (unlikely(Cache == NULL || DepCache == NULL)) return false; - APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(CacheFile, CmdL.FileList + 1); + APT::PackageList pkgset = APT::PackageList::FromCommandLine(CacheFile, CmdL.FileList + 1); if (pkgset.empty() == true) return _error->Error(_("No packages found")); bool MarkAuto = strcasecmp(CmdL.FileList[0],"auto") == 0; int AutoMarkChanged = 0; - for (APT::PackageSet::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg) + for (APT::PackageList::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg) { if (Pkg->CurrentVer == 0) { @@ -81,7 +81,7 @@ bool DoMarkAuto(CommandLine &CmdL) if (unlikely(Cache == NULL || DepCache == NULL)) return false; - APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(CacheFile, CmdL.FileList + 1); + APT::PackageList pkgset = APT::PackageList::FromCommandLine(CacheFile, CmdL.FileList + 1); if (pkgset.empty() == true) return _error->Error(_("No packages found")); @@ -89,7 +89,7 @@ bool DoMarkAuto(CommandLine &CmdL) bool const Verbose = _config->FindB("APT::MarkAuto::Verbose", false); int AutoMarkChanged = 0; - for (APT::PackageSet::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg) + for (APT::PackageList::const_iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg) { if (Pkg->CurrentVer == 0 || (((*DepCache)[Pkg].Flags & pkgCache::Flag::Auto) == pkgCache::Flag::Auto) == MarkAuto) @@ -157,13 +157,13 @@ bool DoHold(CommandLine &CmdL) if (unlikely(Cache == NULL)) return false; - APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(CacheFile, CmdL.FileList + 1); + APT::PackageList pkgset = APT::PackageList::FromCommandLine(CacheFile, CmdL.FileList + 1); if (pkgset.empty() == true) return _error->Error(_("No packages found")); bool const MarkHold = strcasecmp(CmdL.FileList[0],"hold") == 0; - for (APT::PackageSet::iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg) + for (APT::PackageList::iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg) { if ((Pkg->SelectedState == pkgCache::State::Hold) == MarkHold) { @@ -181,7 +181,7 @@ bool DoHold(CommandLine &CmdL) if (_config->FindB("APT::Mark::Simulate", false) == true) { - for (APT::PackageSet::iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg) + for (APT::PackageList::iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg) { if (MarkHold == false) ioprintf(c1out,_("%s set on hold.\n"), Pkg.FullName(true).c_str()); @@ -201,7 +201,7 @@ bool DoHold(CommandLine &CmdL) if (dpkg == NULL) return _error->Errno("DoHold", "fdopen on dpkg stdin failed"); - for (APT::PackageSet::iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg) + for (APT::PackageList::iterator Pkg = pkgset.begin(); Pkg != pkgset.end(); ++Pkg) { if (MarkHold == true) { diff --git a/debian/changelog b/debian/changelog index 95ad73681..058e2926e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,8 +12,12 @@ apt (0.8.16~exp8) experimental; urgency=low * apt-pkg/cacheset.cc: - make the cachesets real containers which can embedding any container to be able to use the same interface regardless of set or list usage + - provide a {Package,Version}List similar to {Package,Version}Set + * cmdline/apt-{get,cache,mark}.cc: + - use Lists instead of Sets if input order should be preserved for + commands accepting lists of packages, e.g. policy (Closes: #625960) - -- David Kalnischkies Wed, 09 Nov 2011 17:21:02 +0100 + -- David Kalnischkies Fri, 11 Nov 2011 15:55:13 +0100 apt (0.8.16~exp7) experimental; urgency=low diff --git a/test/integration/Packages-pdiff-usage-new b/test/integration/Packages-pdiff-usage-new index 9157596a7..4f374b37f 100644 --- a/test/integration/Packages-pdiff-usage-new +++ b/test/integration/Packages-pdiff-usage-new @@ -1,16 +1,3 @@ -Package: newstuff -Version: 1.0 -Architecture: i386 -Maintainer: Joe Sixpack -Installed-Size: 101 -Filename: pool/newstuff_1.0_i386.deb -Size: 101100 -MD5sum: 311aeeadf78324aaff1ceaf3e1f76671 -SHA1: 3c695e028f7a1ae324deeddaaa1242desa81088c -SHA256: b46fd154615edefab321cc56a5cc0e7deaef23e2da3e4f129727fd660f28f050 -Description: some cool and shiny new stuff - This package will appear in the next mirror update - Package: apt Priority: important Section: admin @@ -35,3 +22,16 @@ Description: Advanced front-end for dpkg . APT features complete installation ordering, multiple source capability and several other unique features, see the Users Guide in apt-doc. + +Package: newstuff +Version: 1.0 +Architecture: i386 +Maintainer: Joe Sixpack +Installed-Size: 101 +Filename: pool/newstuff_1.0_i386.deb +Size: 101100 +MD5sum: 311aeeadf78324aaff1ceaf3e1f76671 +SHA1: 3c695e028f7a1ae324deeddaaa1242desa81088c +SHA256: b46fd154615edefab321cc56a5cc0e7deaef23e2da3e4f129727fd660f28f050 +Description: some cool and shiny new stuff + This package will appear in the next mirror update -- cgit v1.2.3-70-g09d2 From 90f6d487d9495db1602e3dc85a4cb45a0e8feed4 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 20 Nov 2011 17:12:15 +0100 Subject: * doc/manpage-style.xml: - put around email addresses --- debian/changelog | 6 ++++-- doc/manpage-style.xsl | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index ef4027406..9ba6780d2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,12 @@ -apt (0.8.15.9+nmu1) unstable; urgency=low +apt (0.8.15.10) unstable; urgency=low [ David Kalnischkies ] * algorithms.cc: - show a debug why a package was kept by ResolveByKeep() + * doc/manpage-style.xml: + - put around email addresses - -- David Kalnischkies Mon, 17 Oct 2011 16:36:22 +0200 + -- David Kalnischkies Sun, 20 Nov 2011 17:10:34 +0100 apt (0.8.15.9) unstable; urgency=low diff --git a/doc/manpage-style.xsl b/doc/manpage-style.xsl index f1024c4f4..85aa4521f 100644 --- a/doc/manpage-style.xsl +++ b/doc/manpage-style.xsl @@ -6,4 +6,6 @@ +<> + -- cgit v1.2.3-70-g09d2 From 2130caa8f4f4d9512551fdf869af499fc901b117 Mon Sep 17 00:00:00 2001 From: Chris Leick Date: Sun, 20 Nov 2011 18:11:56 +0100 Subject: * German manpage translation update * doc/*.xml: - find and fix a bunch of misspellings --- debian/changelog | 7 +- doc/apt-get.8.xml | 6 +- doc/apt-key.8.xml | 2 +- doc/apt.conf.5.xml | 2 +- doc/po/apt-doc.pot | 16 +- doc/po/de.po | 633 +++++++++---------------------- doc/po/es.po | 985 +++++++++++++++++++++++++++++-------------------- doc/po/fr.po | 983 ++++++++++++++++++++++++++++-------------------- doc/po/it.po | 882 +++++++++++++++++++++++-------------------- doc/po/ja.po | 953 +++++++++++++++++++++++++++-------------------- doc/po/pl.po | 919 +++++++++++++++++++++++++-------------------- doc/po/pt.po | 982 ++++++++++++++++++++++++++++-------------------- doc/po/pt_BR.po | 882 +++++++++++++++++++++++-------------------- doc/sources.list.5.xml | 2 +- po/apt-all.pot | 460 +++++++++++------------ 15 files changed, 4216 insertions(+), 3498 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9ba6780d2..3cd6aa410 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,7 +6,12 @@ apt (0.8.15.10) unstable; urgency=low * doc/manpage-style.xml: - put around email addresses - -- David Kalnischkies Sun, 20 Nov 2011 17:10:34 +0100 + [ Chris Leick ] + * German manpage translation update + * doc/*.xml: + - find and fix a bunch of misspellings + + -- David Kalnischkies Sun, 20 Nov 2011 18:02:08 +0100 apt (0.8.15.9) unstable; urgency=low diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index 624e4355e..0b52574e6 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -280,7 +280,7 @@ build-dep build-dep causes apt-get to install/remove packages in an attempt to satisfy the build dependencies for a source package. By default the dependencies are - satisfied to build the package nativly. If desired a host-architecture can be specified + satisfied to build the package natively. If desired a host-architecture can be specified with the option instead. @@ -448,8 +448,8 @@ This option controls the architecture packages are built for by apt-get source --compile and how cross-builddependencies - are satisfied. By default is not set which means that the host architecture - is the same as the build architecture (which is defined by APT::Architecture) + are satisfied. By default is it not set which means that the host architecture + is the same as the build architecture (which is defined by APT::Architecture). Configuration Item: APT::Get::Host-Architecture diff --git a/doc/apt-key.8.xml b/doc/apt-key.8.xml index f17f0c45e..cae2b00a0 100644 --- a/doc/apt-key.8.xml +++ b/doc/apt-key.8.xml @@ -165,7 +165,7 @@ With this option it is possible to specify a specific keyring file the command should operate on. The default is that a command is executed on the trusted.gpg file as well as on all parts in the - trusted.gpg.d directory, through trusted.gpg + trusted.gpg.d directory, though trusted.gpg is the primary keyring which means that e.g. new keys are added to this one. diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index d7d56f3a1..c2220b1bf 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -281,7 +281,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; valid after it was created (indicated by the Date header). Use this if you need to use a seldomly updated (local) mirror of a more regular updated archive with a Valid-Until header - instead of competely disabling the expiration date checking. + instead of completely disabling the expiration date checking. Archive specific settings can and should be used by appending the label of the archive to the option name. diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index d5629377e..630aec3b0 100644 --- a/doc/po/apt-doc.pot +++ b/doc/po/apt-doc.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2011-10-05 23:06+0300\n" +"POT-Creation-Date: 2011-11-20 17:58+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2904,7 +2904,7 @@ msgstr "" msgid "" "build-dep causes apt-get to install/remove packages in an " "attempt to satisfy the build dependencies for a source package. By default " -"the dependencies are satisfied to build the package nativly. If desired a " +"the dependencies are satisfied to build the package natively. If desired a " "host-architecture can be specified with the " " option instead." msgstr "" @@ -3206,9 +3206,9 @@ msgstr "" msgid "" "This option controls the architecture packages are built for by " "apt-get source --compile and how cross-builddependencies " -"are satisfied. By default is not set which means that the host architecture " -"is the same as the build architecture (which is defined by " -"APT::Architecture) Configuration Item: " +"are satisfied. By default is it not set which means that the host " +"architecture is the same as the build architecture (which is defined by " +"APT::Architecture). Configuration Item: " "APT::Get::Host-Architecture" msgstr "" @@ -3677,7 +3677,7 @@ msgid "" "With this option it is possible to specify a specific keyring file the " "command should operate on. The default is that a command is executed on the " "trusted.gpg file as well as on all parts in the " -"trusted.gpg.d directory, through " +"trusted.gpg.d directory, though " "trusted.gpg is the primary keyring which means that " "e.g. new keys are added to this one." msgstr "" @@ -4633,7 +4633,7 @@ msgid "" "Minimum of seconds the Release file should be considered valid after it was " "created (indicated by the Date header). Use this if you " "need to use a seldomly updated (local) mirror of a more regular updated " -"archive with a Valid-Until header instead of competely " +"archive with a Valid-Until header instead of completely " "disabling the expiration date checking. Archive specific settings can and " "should be used by appending the label of the archive to the option name." msgstr "" @@ -6987,7 +6987,7 @@ msgid "" "square brackets. It can consist of multiple settings in the form " "setting=value. " "Multiple settings are separated by spaces. The following settings are " -"supported by APT, note through that unsupported settings will be ignored " +"supported by APT, note though that unsupported settings will be ignored " "silently:" msgstr "" diff --git a/doc/po/de.po b/doc/po/de.po index 0ce5c1bcc..5b5366ed4 100644 --- a/doc/po/de.po +++ b/doc/po/de.po @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: apt-doc 0.8.14-1\n" +"Project-Id-Version: apt-doc 0.8.15-9\n" "Report-Msgid-Bugs-To: APT Development Team \n" "POT-Creation-Date: 2011-10-05 23:06+0300\n" -"PO-Revision-Date: 2011-05-31 21:00+0100\n" +"PO-Revision-Date: 2011-11-13 11:21+0100\n" "Last-Translator: Chris Leick \n" "Language-Team: German \n" "Language: de\n" @@ -99,7 +99,7 @@ msgstr "DIAGNOSE" #. type: Plain text #: apt.8:40 msgid "apt returns zero on normal operation, decimal 100 on error." -msgstr "apt gibt bei normalen Operationen 0 zurück, dezimal 100 bei Fehlern." +msgstr "APT gibt bei normalen Operationen 0 zurück, dezimal 100 bei Fehlern." #. type: SH #: apt.8:40 @@ -132,7 +132,7 @@ msgstr "AUTOR" #. type: Plain text #: apt.8:52 msgid "apt was written by the APT team Eapt@packages.debian.orgE." -msgstr "apt wurde vom APT-Team Eapt@packages.debian.orgE geschrieben." +msgstr "APT wurde vom APT-Team Eapt@packages.debian.orgE geschrieben." #. type: Plain text #: apt.ent:2 @@ -1051,7 +1051,7 @@ msgstr "" #. type: Content of: #: apt-cache.8.xml:197 msgid "search regex [ regex ... ]" -msgstr "search regex [ regex ... ]" +msgstr "search regex [ regex … ]" #. type: Content of: #: apt-cache.8.xml:198 @@ -1396,13 +1396,6 @@ msgstr "" #. type: Content of: #: apt-cache.8.xml:317 -#, fuzzy -#| msgid "" -#| "Per default the depends and rdepends print all dependencies. This can be twicked with these flags " -#| "which will omit the specified dependency type. Configuration Item: " -#| "APT::Cache::ShowDependencyType e.g. APT::Cache::ShowRecommends." msgid "" "Per default the depends and rdepends " "print all dependencies. This can be tweaked with these flags which will omit " @@ -1411,10 +1404,10 @@ msgid "" "Cache::ShowRecommends." msgstr "" "Standardmäßig geben depends und rdepends alle Abhängigkeiten aus. Dies kann mit diesen Schaltern überlistet " +"literal> alle Abhängigkeiten aus. Dies kann mit diesen Schaltern optimiert " "werden, die den angegebenen Abhängigkeitstyp weglassen. " -"Konfigurationselement: APT::Cache::ShowDependencyType z.B. APT::Cache::ShowRecommends." +"Konfigurationselement: APT::Cache::ShowAbhängigkeitstyp" +" z.B. APT::Cache::ShowRecommends." #. type: Content of: #: apt-cache.8.xml:323 apt-cdrom.8.xml:124 apt-get.8.xml:361 @@ -1891,7 +1884,7 @@ msgstr "" "apt-config shell Abbild " +"choice=\"req\"> shell dump " #. type: Content of: #: apt-config.8.xml:51 @@ -3386,35 +3379,6 @@ msgstr "APT-Werkzeug für den Umgang mit Paketen -- Befehlszeilenschnittstelle" #. type: Content of: #: apt-get.8.xml:39 -#, fuzzy -#| msgid "" -#| "apt-get " -#| " " -#| " " -#| " " -#| "target_release update upgrade dselect-upgrade dist-" -#| "upgrade install pkg =pkg_version_number " -#| " /target_release remove pkg purge pkg source " -#| "pkg " -#| " " -#| "=pkg_version_number /target_release build-dep pkg check clean autoclean autoremove -v --version " -#| " -h --" -#| "help " msgid "" "apt-get " " " @@ -3446,31 +3410,32 @@ msgid "" msgstr "" "apt-get " " " -" " -"Ziel-Release " -"update upgrade dselect-upgrade dist-upgrade " -"install " +"Ziel-Release " +" " +"Vorgabearchitektur update upgrade " +"dselect-upgrade dist-upgrade install Paket =Paket-Versionsnummer /Ziel-Release remove Paket purge Paket source " -"Paket " -" =Paket-" -"Versionsnummer /Ziel-" -"Release build-dep Paket check clean autoclean " -"autoremove -v --version -h --help " +"choice='plain'>purge Paket source Paket " +" =Paket-Versionsnummer " +" /Ziel-Release build-dep Paket check clean autoclean autoremove -v --version -h --help " +" " #. type: Content of: #: apt-get.8.xml:122 @@ -3786,12 +3751,6 @@ msgstr "" #. type: Content of: #: apt-get.8.xml:262 -#, fuzzy -#| msgid "" -#| "If the option is specified then the package " -#| "will be compiled to a binary .deb using dpkg-buildpackage, if is specified then the " -#| "source package will not be unpacked." msgid "" "If the option is specified then the package will " "be compiled to a binary .deb using dpkg-buildpackage for " @@ -3799,10 +3758,11 @@ msgid "" "option. If is specified then the source " "package will not be unpacked." msgstr "" -"Wenn die -Option angegeben ist, dann wird das " -"Paket unter Benutzung von dpkg-buildpackage zu einem " -"binären .deb kompiliert, wenn angegeben " -"ist, wird das Quellpaket nicht entpackt." +"Falls die Option angegeben ist, dann wird das " +"Paket unter Benutzung von dpkg-buildpackage für die " +"Architektur, die durch --host-architecture definiert ist, " +"zu einem binären .deb kompiliert. Falls " +"angegeben ist, wird das Quellpaket nicht entpackt." #. type: Content of: #: apt-get.8.xml:269 @@ -3838,20 +3798,19 @@ msgstr "build-dep" #. type: Content of: #: apt-get.8.xml:281 -#, fuzzy -#| msgid "" -#| "build-dep causes apt-get to install/remove packages in " -#| "an attempt to satisfy the build dependencies for a source package." msgid "" "build-dep causes apt-get to install/remove packages in an " "attempt to satisfy the build dependencies for a source package. By default " -"the dependencies are satisfied to build the package nativly. If desired a " +"the dependencies are satisfied to build the package natively. If desired a " "host-architecture can be specified with the " +"angegeben werden." #. type: Content of: #: apt-get.8.xml:287 @@ -3932,19 +3891,14 @@ msgstr "autoremove" #. type: Content of: #: apt-get.8.xml:319 -#, fuzzy -#| msgid "" -#| "autoremove is used to remove packages that were " -#| "automatically installed to satisfy dependencies for some package and that " -#| "are no more needed." msgid "" "autoremove is used to remove packages that were " "automatically installed to satisfy dependencies for other packages and are " "now no longer needed." msgstr "" -"autoremove wird benutzt, um Pakete, die automatisch " -"installiert wurden, um Abhängigkeiten für einige Pakete zu erfüllen und die " -"nicht mehr benötigt werden, zu entfernen." +"autoremove wird benutzt, um Pakete zu entfernen, die " +"automatisch installiert wurden, um Abhängigkeiten für andere Pakete zu " +"erfüllen und die nicht mehr benötigt werden." #. type: Content of: #: apt-get.8.xml:323 @@ -4242,21 +4196,25 @@ msgstr "" #. type: Content of: #: apt-get.8.xml:448 -#, fuzzy -#| msgid "" msgid "" -msgstr "" +msgstr "" #. type: Content of: #: apt-get.8.xml:449 msgid "" "This option controls the architecture packages are built for by apt-" "get source --compile and how cross-builddependencies are " -"satisfied. By default is not set which means that the host architecture is " +"satisfied. By default is it not set which means that the host architecture is " "the same as the build architecture (which is defined by APT::" -"Architecture) Configuration Item: APT::Get::Host-" +"Architecture). Configuration Item: APT::Get::Host-" "Architecture" msgstr "" +"Diese Option steuert, wie die Architekturpakete durch apt-get " +"source --compile gebaut und wie Cross-Bau-Abhängigkeiten erfüllt " +"werden. Standardmäßig ist sie nicht gesetze, was bedeutet, dass die " +"Rechnerarchitektur die gleiche wie die Bau-Architektur ist (die durch " +"APT::Architecture) definiert wird). Konfigurationselement: " +"APT::Get::Host-Architecture" #. type: Content of: #: apt-get.8.xml:457 @@ -4791,13 +4749,16 @@ msgid "" "distribution, e.g. the debian-archive-keyring package in " "Debian." msgstr "" +"Aktualisiert den lokalen Schlüsselbund mit dem Archivschlüsselbund und " +"entfernt die Archivschlüssel, die nicht länger gültig sind, aus dem lokalen " +"Schlüsselbund. Der Archivschlüsselbund wird im Paket " +"archive-keyring Ihrer Distribution mitgeliefert, z.B. dem " +"Paket debian-archive-keyring in Debian." #. type: Content of: #: apt-key.8.xml:141 -#, fuzzy -#| msgid "update" msgid "net-update" -msgstr "update" +msgstr "net-update" #. type: Content of: #: apt-key.8.xml:145 @@ -4809,6 +4770,13 @@ msgid "" "not support this command and relies on update instead, " "but Ubuntu's APT does." msgstr "" +"funktioniert ähnlich dem vorhergehenden Befehl update, " +"bezieht aber den Archivschlüsselbund stattdessen von einer URI und bestätigt " +"ihn anhand eines Master-Schlüssels. Dies erfordert ein installiertes &wget; " +"und einen derart gebauten APT, bei dem ein Server konfiguriert ist, um den " +"Master-Schlüsselbund zur Bestätigung abzuholen. APT unterstützt in Debian " +"diesen Befehl nicht und beruht stattdessen auf update, " +"in Ubuntu funktioniert dies aber." #. type: Content of: #: apt-key.8.xml:162 @@ -4830,7 +4798,7 @@ msgid "" "With this option it is possible to specify a specific keyring file the " "command should operate on. The default is that a command is executed on the " "trusted.gpg file as well as on all parts in the " -"trusted.gpg.d directory, through trusted.gpgtrusted.gpg.d directory, though trusted.gpg is the primary keyring which means that e.g. new keys are added to " "this one." msgstr "" @@ -4887,16 +4855,12 @@ msgstr "&apt-get;, &apt-secure;" #. The last update date #. type: Content of: #: apt-mark.8.xml:16 -#, fuzzy -#| msgid "" -#| "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; 9 " -#| "August 2009" msgid "" "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; 21 " "April 2011" msgstr "" -"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; 9. " -"August 2009" +"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; 21. " +"April 2011" #. type: Content of: #: apt-mark.8.xml:25 apt-mark.8.xml:32 @@ -4912,14 +4876,6 @@ msgstr "" #. type: Content of: #: apt-mark.8.xml:39 -#, fuzzy -#| msgid "" -#| " apt-mark " -#| " markauto unmarkauto package showauto " msgid "" " apt-mark package " msgstr "" -" apt-mark markauto unmarkauto Paket showauto " +" apt-mark " +" auto manual showauto showmanual " +" Paket " #. type: Content of: #: apt-mark.8.xml:57 @@ -4963,52 +4920,40 @@ msgstr "" #. type: Content of: #: apt-mark.8.xml:69 -#, fuzzy -#| msgid "markauto" msgid "auto" -msgstr "markauto" +msgstr "auto" #. type: Content of: #: apt-mark.8.xml:70 -#, fuzzy -#| msgid "" -#| "markauto is used to mark a package as being " -#| "automatically installed, which will cause the package to be removed when " -#| "no more manually installed packages depend on this package." msgid "" "auto is used to mark a package as being automatically " "installed, which will cause the package to be removed when no more manually " "installed packages depend on this package." msgstr "" -"markauto wird benutzt, um ein Paket als automatisch " +"auto wird benutzt, um ein Paket als automatisch " "installiert zu markieren, was veranlasst, dass das Paket entfernt wird, wenn " "keine manuell installierten Pakete von ihm abhängen." #. type: Content of: #: apt-mark.8.xml:77 msgid "manual" -msgstr "" +msgstr "manual" #. type: Content of: #: apt-mark.8.xml:78 -#, fuzzy -#| msgid "" -#| "unmarkauto is used to mark a package as being manually " -#| "installed, which will prevent the package from being automatically " -#| "removed if no other packages depend on it." msgid "" "manual is used to mark a package as being manually " "installed, which will prevent the package from being automatically removed " "if no other packages depend on it." msgstr "" -"markauto wird benutzt, um ein Paket als manuell " -"installiert zu markieren, was verhindert, dass das Paket automatisch " -"entfernt wird, wenn kein anderes Paket von ihm abhängt." +"manual wird benutzt, um ein Paket als manuell installiert " +"zu markieren, was verhindert, dass das Paket automatisch entfernt wird, wenn " +"kein anderes Paket von ihm abhängt." #. type: Content of: #: apt-mark.8.xml:85 msgid "hold" -msgstr "" +msgstr "hold" #. type: Content of: #: apt-mark.8.xml:86 @@ -5019,24 +4964,26 @@ msgid "" "selections and the state is therefore maintained by &dpkg; and not " "effected by the option." msgstr "" +"hold wird benutzt, um ein Paket als zurückgehalten zu " +"markieren, was verhindert, dass das Paket automatisch installiert, ein " +"Upgrade davon durchgeführt oder es entfernt wird. Der Befehl ist nur ein " +"Wrapper um dpkg --set-selections und der Status wird daher " +"durch &dpkg; verwaltet und nicht durch die Option " +"." #. type: Content of: #: apt-mark.8.xml:95 msgid "unhold" -msgstr "" +msgstr "unhold" #. type: Content of: #: apt-mark.8.xml:96 -#, fuzzy -#| msgid "" -#| "showauto is used to print a list of automatically " -#| "installed packages with each package on a new line." msgid "" "unhold is used to cancel a previously set hold on a " "package to allow all actions again." msgstr "" -"showauto wird benutzt, um eine Liste automatisch " -"installierter Pakete mit einem Paket in jeder neuen Zeile, auszugeben." +"unhold wird benutzt, um ein vorher gesetztes »hold« " +"auf ein Paket aufzuheben, um alle Aktionen wieder zu erlauben." #. type: Content of: #: apt-mark.8.xml:101 @@ -5045,10 +4992,6 @@ msgstr "showauto" #. type: Content of: #: apt-mark.8.xml:102 -#, fuzzy -#| msgid "" -#| "showauto is used to print a list of automatically " -#| "installed packages with each package on a new line." msgid "" "showauto is used to print a list of automatically " "installed packages with each package on a new line. All automatically " @@ -5056,14 +4999,15 @@ msgid "" "given only those which are automatically installed will be shown." msgstr "" "showauto wird benutzt, um eine Liste automatisch " -"installierter Pakete mit einem Paket in jeder neuen Zeile, auszugeben." +"installierter Pakete – mit einem Paket in jeder neuen Zeile – auszugeben. " +"Wenn kein Paket angegeben ist, werden alle automatisch installierten Pakete " +"aufgelistet. Falls Pakete angegeben sind, werden nur diejenigen angezeigt, " +"die automatisch installiert wurden." #. type: Content of: #: apt-mark.8.xml:109 -#, fuzzy -#| msgid "showauto" msgid "showmanual" -msgstr "showauto" +msgstr "showmanual" #. type: Content of: #: apt-mark.8.xml:110 @@ -5072,26 +5016,23 @@ msgid "" "showauto except that it will print a list of manually " "installed packages instead." msgstr "" +"showmanual kann auf die gleiche Weise wie " +"showauto benutzt werden, mit der Ausnahme, dass es " +"stattdessen eine Liste manuell installierter Pakete ausgibt." #. type: Content of: #: apt-mark.8.xml:116 -#, fuzzy -#| msgid "showauto" msgid "showhold" -msgstr "showauto" +msgstr "showhold" #. type: Content of: #: apt-mark.8.xml:117 -#, fuzzy -#| msgid "" -#| "showauto is used to print a list of automatically " -#| "installed packages with each package on a new line." msgid "" "showhold is used to print a list of packages on hold in " "the same way as for the other show commands." msgstr "" -"showauto wird benutzt, um eine Liste automatisch " -"installierter Pakete mit einem Paket in jeder neuen Zeile, auszugeben." +"showhold wird benutzt, um eine Liste auf »hold« gesetzter " +"Pakete auf die gleiche Art wie für andere Anzeigebefehle auszugeben." #. type: Content of: #: apt-mark.8.xml:130 @@ -5539,8 +5480,8 @@ msgid "" msgstr "" "&apt-author.jgunthorpe; &apt-author.team; Daniel Burrows Erste Dokumentation von " -"Debug::*. dburrows@debian.org &apt-email; " -"&apt-product; 16. Januar 2010" +"Debug::*. dburrows@debian.org " +" &apt-email; &apt-product; 16. Januar 2010" #. type: Content of: #: apt.conf.5.xml:31 apt.conf.5.xml:38 @@ -5591,15 +5532,6 @@ msgstr "" #. type: Content of: #: apt.conf.5.xml:52 -#, fuzzy -#| msgid "" -#| "all files in Dir::Etc::Parts in alphanumeric ascending " -#| "order which have no or \"conf\" as filename extension " -#| "and which only contain alphanumeric, hyphen (-), underscore (_) and " -#| "period (.) characters. Otherwise APT will print a notice that it has " -#| "ignored a file if the file doesn't match a pattern in the Dir::" -#| "Ignore-Files-Silently configuration list - in this case it will " -#| "be silently ignored." msgid "" "all files in Dir::Etc::Parts in alphanumeric ascending " "order which have either no or \"conf\" as filename " @@ -5610,13 +5542,13 @@ msgid "" "silently ignored." msgstr "" "alle Dateien in Dir::Etc::Parts in aufsteigender " -"alphanumerischer Reihenfolge, die kein »conf« als " -"Dateinamenserweiterung haben und die nur alphanumerische Zeichen, " -"Bindestriche (-), Unterstriche (_) und Punkte (.) enthalten. Andernfalls " -"wird APT einen Hinweis ausgeben, dass es eine Datei ignoriert hat, falls die " -"Datei nicht auf ein Muster in der Konfigurationsliste Dir::Ignore-" -"Files-Silently passt – in diesem Fall wird sie stillschweigend " -"ignoriert." +"alphanumerischer Reihenfolge, die entweder keine oder " +"»conf« als Dateinamenserweiterung haben und die nur " +"alphanumerische Zeichen, Bindestriche (-), Unterstriche (_) und Punkte (.) " +"enthalten. Andernfalls wird APT einen Hinweis ausgeben, dass es eine Datei " +"ignoriert hat, falls die Datei nicht auf ein Muster in der " +"Konfigurationsliste Dir::Ignore-Files-Silently passt – in " +"diesem Fall wird sie stillschweigend ignoriert." #. type: Content of: #: apt.conf.5.xml:59 @@ -5883,6 +5815,14 @@ msgid "" "(APT::Architecture) and all foreign architectures it can " "retrieve by calling dpkg --print-foreign-architectures." msgstr "" +"Alle Architekturen, die das System unterstützt. Prozessoren, die " +"amd64 implementieren sind beispielsweise ebenso in der " +"Lage, Programme auszuführen, die für i386 kompiliert " +"wurden. Diese Liste wird benutzt, wenn Dateien abgerufen und Paketlisten " +"ausgewertet werden. Die interne Vorgabe ist immer die native Architektur " +"(APT::Architecture) und alle fremden Architekturen, die " +"durch Aufruf von dpkg --print-foreign-architectures " +"abgefragt werden können." #. type: Content of: #: apt.conf.5.xml:165 @@ -6168,17 +6108,6 @@ msgstr "Max-ValidTime" #. type: Content of: #: apt.conf.5.xml:269 -#, fuzzy -#| msgid "" -#| "Seconds the Release file should be considered valid after it was created. " -#| "The default is \"for ever\" (0) if the Release file of the archive " -#| "doesn't include a Valid-Until header. If it does then " -#| "this date is the default. The date from the Release file or the date " -#| "specified by the creation time of the Release file (Date header) plus the seconds specified with this options are used to " -#| "check if the validation of a file has expired by using the earlier date " -#| "of the two. Archive specific settings can be made by appending the label " -#| "of the archive to the option name." msgid "" "Seconds the Release file should be considered valid after it was created " "(indicated by the Date header). If the Release file " @@ -6188,54 +6117,36 @@ msgid "" "made by appending the label of the archive to the option name." msgstr "" "Sekunden, die die Release-Datei als gültig betrachtet werden sollte, nachdem " -"sie erzeugt wurde. Vorgabe ist »für immer« (0), falls die Release-Datei des " -"Archivs keine Valid-Until-Kopfzeile enthält. Falls dies " -"so ist, ist dieses Datum vorgegeben. Das Datum aus der Release-Datei oder " -"das Datum, das durch die Erstellungszeit der Release-Datei angegeben wurde " -"(Date-Kopfzeile) plus die mit diesen Optionen angegebenen " -"Sekunden werden benutzt, um zu prüfen, ob die Bestätigung einer Datei " -"abgelaufen ist indem das neuere Datum der beiden benutzt wird. " +"sie erzeugt wurde (angezeigt durch die Kopfzeile Date). " +"Falls die Release-Datei selbst eine Valid-Until-Kopfzeile " +"enhält, wird der frühere von beiden Terminen als Verfallsdatum benutzt. " +"Vorgabewert ist 0, was »für immer« bedeutet. " "Archivspezifische Einstellungen können durch Anhängen des Archivetiketts an " "die Option »name« vorgenommen werden." #. type: Content of: #: apt.conf.5.xml:279 -#, fuzzy -#| msgid "Max-ValidTime" msgid "Min-ValidTime" -msgstr "Max-ValidTime" +msgstr "Min-ValidTime" #. type: Content of: #: apt.conf.5.xml:280 -#, fuzzy -#| msgid "" -#| "Seconds the Release file should be considered valid after it was created. " -#| "The default is \"for ever\" (0) if the Release file of the archive " -#| "doesn't include a Valid-Until header. If it does then " -#| "this date is the default. The date from the Release file or the date " -#| "specified by the creation time of the Release file (Date header) plus the seconds specified with this options are used to " -#| "check if the validation of a file has expired by using the earlier date " -#| "of the two. Archive specific settings can be made by appending the label " -#| "of the archive to the option name." msgid "" "Minimum of seconds the Release file should be considered valid after it was " "created (indicated by the Date header). Use this if you " "need to use a seldomly updated (local) mirror of a more regular updated " -"archive with a Valid-Until header instead of competely " +"archive with a Valid-Until header instead of completely " "disabling the expiration date checking. Archive specific settings can and " "should be used by appending the label of the archive to the option name." msgstr "" -"Sekunden, die die Release-Datei als gültig betrachtet werden sollte, nachdem " -"sie erzeugt wurde. Vorgabe ist »für immer« (0), falls die Release-Datei des " -"Archivs keine Valid-Until-Kopfzeile enthält. Falls dies " -"so ist, ist dieses Datum vorgegeben. Das Datum aus der Release-Datei oder " -"das Datum, das durch die Erstellungszeit der Release-Datei angegeben wurde " -"(Date-Kopfzeile) plus die mit diesen Optionen angegebenen " -"Sekunden werden benutzt, um zu prüfen, ob die Bestätigung einer Datei " -"abgelaufen ist indem das neuere Datum der beiden benutzt wird. " -"Archivspezifische Einstellungen können durch Anhängen des Archivetiketts an " -"die Option »name« vorgenommen werden." +"Minimale Anzahl der Sekunden, die die Release-Datei als gültig betrachtet " +"werden sollte, nachdem sie erzeugt wurde (angezeigt durch die Kopfzeile " +"Date). Benutzen Sie dies, falls Sie einen selten " +"aktualisierten (lokalen) Spiegel eines regelmäßiger aktualisierten Archivs " +"mit einer Valid-Until-Kopfzeile haben, anstatt die " +"Überprüfung des Ablaufdatum komplett zu deaktivieren. Archivspezifische " +"Einstellungen können und sollten durch Anhängen des Archivetiketts an die " +"Option »name« vorgenommen werden." #. type: Content of: #: apt.conf.5.xml:290 @@ -6705,18 +6616,6 @@ msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";" #. type: Content of: #: apt.conf.5.xml:459 -#, fuzzy -#| msgid "" -#| "Note that at run time the Dir::Bin::Methodname will be checked: If this setting exists the method " -#| "will only be used if this file exists, e.g. for the bzip2 method (the " -#| "inbuilt) setting is Note " -#| "also that list entries specified on the command line will be added at the " -#| "end of the list specified in the configuration files, but before the " -#| "default entries. To prefer a type in this case over the ones specified in " -#| "the configuration files you can set the option direct - not in list " -#| "style. This will not override the defined list, it will only prefix the " -#| "list with this type." msgid "" "Note that at run time the Dir::Bin::Methodname will be checked: If this setting exists the method " @@ -6731,8 +6630,8 @@ msgid "" msgstr "" "Beachten Sie, dass Dir::Bin::Methodenname zur Laufzeit geprüft wird: Falls diese Einstellung " -"existiert, wird die Methode nur benutzt, wenn die Datei existiert, z.B. für " -"die (integrierte) bzip2-Methode ist die Einstellung . Beachten Sie auch, dass auf der Befehlszeile " "eingegebenen Einträge an das Ende der Liste angehängt werden, die in den " "Konfigurationsdateien angegeben wurde, aber vor den Vorgabeeinträgen. Um " @@ -8030,16 +7929,6 @@ msgstr "" #. type: Content of: #: apt_preferences.5.xml:70 -#, fuzzy -#| msgid "" -#| "Note that the files in the /etc/apt/preferences.d " -#| "directory are parsed in alphanumeric ascending order and need to obey the " -#| "following naming convention: The files have no or \"pref\" as filename extension and which only contain alphanumeric, " -#| "hyphen (-), underscore (_) and period (.) characters. Otherwise APT will " -#| "print a notice that it has ignored a file if the file doesn't match a " -#| "pattern in the Dir::Ignore-Files-Silently " -#| "configuration list - in this case it will be silently ignored." msgid "" "Note that the files in the /etc/apt/preferences.d " "directory are parsed in alphanumeric ascending order and need to obey the " @@ -8052,13 +7941,13 @@ msgid "" msgstr "" "Beachten Sie, dass die Dateien im Verzeichnis /etc/apt/preferences." "d in alphanumerisch aufsteigender Reihenfolge ausgewertet werden " -"und der folgenden Namenskonvention unterliegen: Die Dateien haben keine oder " -"»pref« als Dateierweiterung und sie enthalten nur " -"alphanumerische Zeichen, Bindestriche (-), Unterstriche (_) oder Punkte (.). " -"Andernfalls wird APT einen Hinweis ausgeben, dass es eine Datei ignoriert " -"hat, falls die Datei nicht auf ein Muster in der Konfigurationsliste " -"Dir::Ignore-Files-Silently passt – in diesem Fall wird " -"sie stillschweigend ignoriert." +"und der folgenden Namenskonvention unterliegen: Die Dateien haben entweder " +"keine oder »pref« als Dateierweiterung und sie enthalten " +"nur alphanumerische Zeichen, Bindestriche (-), Unterstriche (_) oder Punkte " +"(.). Andernfalls wird APT einen Hinweis ausgeben, dass es eine Datei " +"ignoriert hat, falls die Datei nicht auf ein Muster in der " +"Konfigurationsliste Dir::Ignore-Files-Silently passt – in " +"diesem Fall wird sie stillschweigend ignoriert." #. type: Content of: #: apt_preferences.5.xml:79 @@ -8112,12 +8001,6 @@ msgstr "Priorität 1" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #: apt_preferences.5.xml:107 -#, fuzzy -#| msgid "" -#| "to the versions coming from archives which in their <filename>Release</" -#| "filename> files are marked as \"NotAutomatic: yes\" but <emphasis>not</" -#| "emphasis> as \"ButAutomaticUpgrades: yes\" like the debian " -#| "<literal>experimental</literal> archive." msgid "" "to the versions coming from archives which in their <filename>Release</" "filename> files are marked as \"NotAutomatic: yes\" but <emphasis>not</" @@ -8187,14 +8070,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> #: apt_preferences.5.xml:132 -#, fuzzy -#| msgid "" -#| "If the target release has not been specified then APT simply assigns " -#| "priority 100 to all installed package versions and priority 500 to all " -#| "uninstalled package versions, except versions coming from archives which " -#| "in their <filename>Release</filename> files are marked as \"NotAutomatic: " -#| "yes\" - these versions get the priority 1 or priority 100 if it is " -#| "additionally marked as \"ButAutomaticUpgrades: yes\"." msgid "" "If the target release has not been specified then APT simply assigns " "priority 100 to all installed package versions and priority 500 to all " @@ -8206,7 +8081,7 @@ msgstr "" "Wenn das Ziel-Release nicht angegeben wurde, dann weist APT einfach allen " "installierten Paketversionen eine Priorität von 100 und allen nicht " "installierten Paketversionen eine Priorität von 500 zu, außer wenn Versionen " -"aus Archiven kommen, die in deren <filename>Release<filename>-Dateien " +"aus Archiven kommen, die in deren <filename>Release</filename>-Dateien mit " "»NotAutomatic: yes« markiert sind – diese Versionen erhalten die Priorität 1 " "oder die Priorität 100, falls sie zusätzlich als »ButAutomaticUpgrades: yes« " "markiert sind." @@ -8817,9 +8692,9 @@ msgid "" "\"0\"/>" msgstr "" "Die <filename>Packages</filename>-Datei wird normalerweise im Verzeichnis " -"<filename>.../dists/<replaceable>Distributions-Name</replaceable>/" +"<filename>…/dists/<replaceable>Distributions-Name</replaceable>/" "<replaceable>Komponente</replaceable>/<replaceable>Architektur</" -"replaceable></filename> gefunden, zum Beispiel <filename>.../dists/stable/" +"replaceable></filename> gefunden, zum Beispiel <filename>…/dists/stable/" "main/binary-i386/Packages</filename>. Sie besteht aus einer Serie " "mehrzeiliger Datensätze, einem für jedes verfügbare Paket in diesem " "Verzeichnis. In jedem Datensatz sind nur zwei Zeilen zum Setzen der APT-" @@ -8999,9 +8874,9 @@ msgid "" "\"0\"/>" msgstr "" "Die <filename>Release</filename>-Datei ist normalerweise im Verzeichnis " -"<filename>.../dists/<replaceable>Distributionsname</replaceable></filename> " -"zu finden, zum Beispiel <filename>.../dists/stable/Release</filename> oder " -"<filename>.../dists/&stable-codename;/Release</filename>. Sie besteht aus " +"<filename>…/dists/<replaceable>Distributionsname</replaceable></filename> " +"zu finden, zum Beispiel <filename>…/dists/stable/Release</filename> oder " +"<filename>…/dists/&stable-codename;/Release</filename>. Sie besteht aus " "einem einzelnen mehrzeiligen Datensatz, der auf <emphasis>alle</emphasis> " "Pakete im Verzeichnisbaum unterhalb des übergeordneten Verzeichnisses " "zutrifft. Anders als die <filename>Packages</filename>-Datei sind nahezu " @@ -9459,10 +9334,8 @@ msgstr "" #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml:81 -#, fuzzy, no-wrap -#| msgid "deb uri distribution [component1] [component2] [...]" msgid "deb [ options ] uri distribution [component1] [component2] [...]" -msgstr "deb URI Distribution [Komponente1] [Komponente2] [...]" +msgstr "deb [ Optionen ] URI Distribution [Komponente1] [Komponente2] […]" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:83 @@ -9495,9 +9368,9 @@ msgid "" "of interest when specifying an exact path, <literal>APT</literal> will " "automatically generate a URI with the current architecture otherwise." msgstr "" -"<literal> distribution</literal> könnte außerdem eine Variable, <literal>" +"<literal>Distribution</literal> könnte außerdem eine Variable, <literal>" "$(ARCH)</literal>, enthalten, die zur Debian-Architektur (i386, m68k, " -"powerpc, ...) expandiert wird, die auf dem System benutzt wird. Dies erlaubt " +"powerpc, …) expandiert wird, die auf dem System benutzt wird. Dies erlaubt " "es, architekturabhängige <filename>sources.list</filename>-Dateien zu " "benutzen. Im Allgemeinen ist dies nur von Interesse, wenn ein genauer Pfad " "angegeben wird, andernfalls wird <literal>APT</literal> automatisch eine URI " @@ -9537,9 +9410,16 @@ msgid "" "square brackets. It can consist of multiple settings in the form " "<literal><replaceable>setting</replaceable>=<replaceable>value</" "replaceable></literal>. Multiple settings are separated by spaces. The " -"following settings are supported by APT, note through that unsupported " +"following settings are supported by APT, note though that unsupported " "settings will be ignored silently:" msgstr "" +"<literal>options</literal> ist immer optional und muss in eckige Klammern " +"eingeschlossen werden. Es kann aus mehreren Einstellungen in der Form " +"<literal><replaceable>Einstellung</replaceable>=<replaceable>Wert" +"</replaceable></literal> bestehen. Mehrere Einstellungen werden durch " +"Leerzeichen getrennt. Die folgenden Einstellungen werden von APT unterstützt. " +"Beachten Sie allerdings, dass nicht unterstützte Einstellungen " +"stillschweigend ignoriert werden." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> #: sources.list.5.xml:117 @@ -9550,6 +9430,12 @@ msgid "" "architectures defined by the <literal>APT::Architectures</literal> option " "will be downloaded." msgstr "" +"<literal>arch=<replaceable>Architektur1</replaceable>,<replaceable>" +"Architektur2</replaceable>, …</literal> kann benutzt werden, um anzugeben, " +"für welche Architekturen Paketinformationen heruntergeladen werden sollen. " +"Falls diese Option nicht gesetzt ist, werden alle durch die Option " +"<literal>APT::Architectures</literal> definierten Architekturen " +"heruntergeladen." #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:123 @@ -9775,21 +9661,19 @@ msgid "" "<literal>APT::Architectures</literal> while the second always retrieves " "<literal>amd64</literal> and <literal>armel</literal>." msgstr "" +"Die erste Zeile bekommt Paketinformationen für die Architekturen in " +"<literal>APT::Architectures</literal>, während die zweite immer " +"<literal>amd64</literal> und <literal>armel</literal> holt." #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml:222 -#, fuzzy, no-wrap -#| msgid "" -#| "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n" -#| "deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n" -#| " " +#, no-wrap msgid "" "deb http://ftp.debian.org/debian &stable-codename; main\n" "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main" msgstr "" -"deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n" -"deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n" -" " +"deb http://ftp.debian.org/debian &stable-codename; main\n" +"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:225 @@ -10104,8 +9988,8 @@ msgstr "" "# apt-get update\n" "OK http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages\n" "OK http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n" -"Paketlisten werden gelesen... Fertig\n" -"Abhängigkeitsbaum wird aufgebaut... Fertig" +"Paketlisten werden gelesen … Fertig\n" +"Abhängigkeitsbaum wird aufgebaut … Fertig" #. type: <p><taglist> #: guide.sgml:120 @@ -10454,8 +10338,8 @@ msgid "" "Building Dependency Tree... Done" msgstr "" "# apt-get check\n" -"Paketlisten werden gelesen... Fertig\n" -"Abhängigkeitsbaum wird aufgebaut" +"Paketlisten werden gelesen … Fertig\n" +"Abhängigkeitsbaum wird aufgebaut … Fertig" #. type: <p></p> #: guide.sgml:297 @@ -10506,9 +10390,9 @@ msgid "" " libreadlineg2: Conflicts:libreadline2 (<< 2.1-2.1)" msgstr "" "# apt-get check\n" -"Paketlisten werden gelesen... Fertig\n" +"Paketlisten werden gelesen … Fertig Fertig\n" "Abhängigkeitsbaum wird aufgebaut\n" -"Status-Informationen einlesen... Fertig\n" +"Status-Informationen einlesen … Fertig Fertig\n" "Probieren Sie „apt-get -f install“, um diese zu korrigieren:\n" "Die folgenden Pakete haben nichterfüllte Abhängigkeiten:\n" " 9fonts: Hängt ab: xlib6g ist aber nicht installiert\n" @@ -11404,7 +11288,7 @@ msgid "" msgstr "" " # cd /Platte\n" " # sh -x ./wget-script\n" -" [ warten ... ]" +" [ warten … Fertig ]" #. type: </example><example> #: offline.sgml:228 @@ -11425,162 +11309,3 @@ msgstr " # apt-get -o dir::cache::archives=\"/Platte/\" dist-upgrade" #: offline.sgml:234 msgid "Which will use the already fetched archives on the disc." msgstr "Es wird die bereits auf die Platte heruntergeladenen Archive benutzen." - -#~ msgid "" -#~ "Update the local keyring with the keyring of Debian archive keys and " -#~ "removes from the keyring the archive keys which are no longer valid." -#~ msgstr "" -#~ "Den lokalen Schlüsselbund mit dem Schlüsselbund der Debian-" -#~ "Archivschlüssel aktualisieren und aus dem Schlüsselbund die " -#~ "Archivschlüssel entfernen, die nicht länger gültig sind." - -#~ msgid "<option>--md5</option>" -#~ msgstr "<option>--md5</option>" - -#~ msgid "" -#~ "Generate MD5 sums. This defaults to on, when turned off the generated " -#~ "index files will not have MD5Sum fields where possible. Configuration " -#~ "Item: <literal>APT::FTPArchive::MD5</literal>" -#~ msgstr "" -#~ "Generiert MD5-Summen. Dies ist standardmäßig an, wenn es ausgeschaltet " -#~ "ist, haben die generierten Indexdateien keine MD5Sum-Felder, sofern dies " -#~ "möglich ist. Konfigurationselement: <literal>APT::FTPArchive::MD5</" -#~ "literal>" - -#~ msgid "unmarkauto" -#~ msgstr "unmarkauto" - -#~ msgid "<option>-h</option>" -#~ msgstr "<option>-h</option>" - -#~ msgid "<option>--help</option>" -#~ msgstr "<option>--help</option>" - -#~ msgid "Show a short usage summary." -#~ msgstr "Eine kurze Zusammenfassung anzeigen." - -#~ msgid "<option>-v</option>" -#~ msgstr "<option>-v</option>" - -#~ msgid "<option>--version</option>" -#~ msgstr "<option>--version</option>" - -#~ msgid "Show the program version." -#~ msgstr "Die Programmversion anzeigen." - -#~ msgid "to the version that is already installed (if any)." -#~ msgstr "zu der Version, die bereits installiert ist (wenn vorhanden)." - -#~ msgid "APT package handling utility -- cache manipulator" -#~ msgstr "" -#~ "APT-Werkzeug zur Handhabung von Paketen -- Zwischenspeichermanipulierer" - -#~ msgid "add <replaceable>file(s)</replaceable>" -#~ msgstr "add <replaceable>Datei(en)</replaceable>" - -#~ msgid "" -#~ "<literal>add</literal> adds the named package index files to the package " -#~ "cache. This is for debugging only." -#~ msgstr "" -#~ "<literal>add</literal> fügt die genannten Paket-Index-Dateien zum " -#~ "Paketzwischenspeicher hinzu. Dies dient nur der Fehlersuche." - -#~ msgid "" -#~ "The <literal>release</literal> command generates a Release file from a " -#~ "directory tree. It recursively searches the given directory for Packages, " -#~ "Packages.gz, Packages.bz2, Sources, Sources.gz, Sources.bz2, Release and " -#~ "md5sum.txt files. It then writes to stdout a Release file containing an " -#~ "MD5 digest and SHA1 digest for each file." -#~ msgstr "" -#~ "Der <literal>release</literal>-Befehl generiert eine Release-Datei aus " -#~ "einem Verzeichnisbaum. Er durchsucht das vorgegebene Verzeichnis rekursiv " -#~ "nach Packages-, Packages.gz-, Packages.bz2-, Sources-, Sources.gz-, " -#~ "Sources.bz2-, Release- und md5sum.txt-Dateien. Dann schreibt es eine " -#~ "Release-Datei nach stdout, die einen MD5- und SHA1-Hash für jede Datei " -#~ "enthält." - -#~ msgid "<option>--install-recommends</option>" -#~ msgstr "<option>--install-recommends</option>" - -#~ msgid "Also install recommended packages." -#~ msgstr "Installiert außerdem empfohlene Pakete." - -#~ msgid "Do not install recommended packages." -#~ msgstr "Keine empfohlenen Pakete installieren." - -#~ msgid "" -#~ "While it is possible to add an empty compression type to the order list, " -#~ "but APT in its current version doesn't understand it correctly and will " -#~ "display many warnings about not downloaded files - these warnings are " -#~ "most of the time false negatives. Future versions will maybe include a " -#~ "way to really prefer uncompressed files to support the usage of local " -#~ "mirrors." -#~ msgstr "" -#~ "Obwohl es möglich ist, einen leeren Komprimierungstyp zu der " -#~ "Reihenfolgenliste hinzuzufügen, versteht dies APT in der aktuellen " -#~ "Version nicht richtig und wird viele Warnungen wegen nicht " -#~ "heruntergeladener Dateien anzeigen – diese Warnungen sind meistens " -#~ "inkorrekte Treffer. Zukünftige Versionen werden möglicherweise eine " -#~ "Möglichkeit enthalten, um wirklich unkomprimierte Dateien vorzuziehen, um " -#~ "den Gebrauch lokaler Spiegel zu unterstützen." - -#~ msgid "" -#~ "Uses HTTP to access the archive at nonus.debian.org, under the debian-non-" -#~ "US directory." -#~ msgstr "" -#~ "Benutzt HTTP, um auf das Archiv auf nonus.debian.org unter dem debian-non-" -#~ "US-Verzeichnis zuzugreifen." - -#~ msgid "" -#~ "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-" -#~ "free" -#~ msgstr "" -#~ "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-" -#~ "free" - -#~ msgid "OPTIONS" -#~ msgstr "OPTIONEN" - -#~ msgid "None." -#~ msgstr "Keine" - -#~ msgid "FILES" -#~ msgstr "DATEIEN" - -#~ msgid "<filename>/var/lib/apt/extended_states</filename>" -#~ msgstr "<filename>/var/lib/apt/extended_states</filename>" - -#~ msgid "" -#~ "Status list of auto-installed packages. Configuration Item: " -#~ "<literal>Dir::State</literal> sets the path to the " -#~ "<filename>extended_states</filename> file." -#~ msgstr "" -#~ "Statusliste automatisch installierter Pakete. Konfigurationselement: " -#~ "<literal>Dir::State</literal> setzt den Pfad zur Datei " -#~ "<filename>extended_states</filename>." - -#~ msgid "Cache-Limit" -#~ msgstr "Cache-Limit" - -#~ msgid "" -#~ "APT uses a fixed size memory mapped cache file to store the 'available' " -#~ "information. This sets the size of that cache (in bytes)." -#~ msgstr "" -#~ "APT benutzt eine Zwischenspeicherdatei mit fester Größe, um die " -#~ "»verfügbar«-Informationen zu speichern. Dies setzt die Größe dieses " -#~ "Zwischenspeichers (in Bytes)." - -#~ msgid "Pin: release n=squeeze\n" -#~ msgstr "Pin: release n=squeeze\n" - -#~ msgid "" -#~ "The <literal>Pin-Priority:</literal> line in each APT preferences record " -#~ "is optional. If omitted, APT assigns a priority of 1 less than the last " -#~ "value specified on a line beginning with <literal>Pin-Priority: " -#~ "release ...</literal>." -#~ msgstr "" -#~ "Die <literal>Pin-Priority:</literal>-Zeile in jedem APT-" -#~ "Einstellungsdatensatz ist optional. Wenn diese weggelassen wird, weist " -#~ "APT ein Priorität zu, die um 1 kleiner ist, als der letzte Wert, der in " -#~ "einer Zeile angegeben wurde, die mit <literal>Pin-Priority: release ...</" -#~ "literal> anfängt." diff --git a/doc/po/es.po b/doc/po/es.po index dedd69db4..0849736fa 100644 --- a/doc/po/es.po +++ b/doc/po/es.po @@ -36,7 +36,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.25\n" -"POT-Creation-Date: 2011-06-28 16:42+0200\n" +"POT-Creation-Date: 2011-11-20 17:58+0100\n" "PO-Revision-Date: 2010-08-25 03:25+0200\n" "Last-Translator: Omar Campagne <ocampagne@gmail.com>\n" "Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n" @@ -809,7 +809,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:64 apt-cdrom.8.xml:50 apt-config.8.xml:50 -#: apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:114 +#: apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:121 #: apt-key.8.xml:38 apt-mark.8.xml:56 apt-secure.8.xml:43 #: apt-sortpkgs.1.xml:47 apt.conf.5.xml:42 apt_preferences.5.xml:36 #: sources.list.5.xml:36 @@ -830,7 +830,7 @@ msgstr "" "genera información interesante a partir de los metadatos del paquete." #. type: Content of: <refentry><refsect1><para> -#: apt-cache.8.xml:70 apt-get.8.xml:120 +#: apt-cache.8.xml:70 apt-get.8.xml:127 msgid "" "Unless the <option>-h</option>, or <option>--help</option> option is given, " "one of the commands below must be present." @@ -1327,8 +1327,8 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:278 apt-config.8.xml:96 apt-extracttemplates.1.xml:59 -#: apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:126 -#: apt-sortpkgs.1.xml:57 apt.conf.5.xml:560 apt.conf.5.xml:582 +#: apt-ftparchive.1.xml:525 apt-get.8.xml:342 apt-mark.8.xml:126 +#: apt-sortpkgs.1.xml:57 apt.conf.5.xml:577 apt.conf.5.xml:599 msgid "options" msgstr "Opciones" @@ -1354,7 +1354,7 @@ msgstr "" "configuración: <literal>Dir::Cache::pkgcache</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:288 apt-ftparchive.1.xml:572 apt-get.8.xml:393 +#: apt-cache.8.xml:288 apt-ftparchive.1.xml:572 apt-get.8.xml:404 #: apt-sortpkgs.1.xml:61 msgid "<option>-s</option>" msgstr "<option>-s</option>" @@ -1380,12 +1380,12 @@ msgstr "" "Opción de configuración: <literal>Dir::Cache::srcpkgcache</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:383 +#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:394 msgid "<option>-q</option>" msgstr "<option>-q</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:383 +#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:394 msgid "<option>--quiet</option>" msgstr "<option>--quiet</option>" @@ -1488,7 +1488,7 @@ msgstr "" "<literal>APT::Cache::ShowRecommends</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:323 apt-cdrom.8.xml:124 apt-get.8.xml:350 +#: apt-cache.8.xml:323 apt-cdrom.8.xml:124 apt-get.8.xml:361 msgid "<option>-f</option>" msgstr "<option>-f</option>" @@ -1508,6 +1508,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:584 +#: apt-get.8.xml:447 msgid "<option>-a</option>" msgstr "<option>-a</option>" @@ -1624,14 +1625,14 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist> #: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101 -#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:612 apt-get.8.xml:570 +#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:612 apt-get.8.xml:591 #: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67 msgid "&apt-commonoptions;" msgstr "&apt-commonoptions;" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:172 apt-mark.8.xml:144 -#: apt.conf.5.xml:1093 apt_preferences.5.xml:697 +#: apt-cache.8.xml:372 apt-get.8.xml:596 apt-key.8.xml:175 apt-mark.8.xml:144 +#: apt.conf.5.xml:1110 apt_preferences.5.xml:697 msgid "Files" msgstr "Ficheros" @@ -1642,10 +1643,10 @@ msgstr "&file-sourceslist; &file-statelists;" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106 -#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:628 apt-get.8.xml:585 -#: apt-key.8.xml:193 apt-mark.8.xml:150 apt-secure.8.xml:185 -#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:704 -#: sources.list.5.xml:234 +#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:628 apt-get.8.xml:606 +#: apt-key.8.xml:196 apt-mark.8.xml:150 apt-secure.8.xml:185 +#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1116 apt_preferences.5.xml:704 +#: sources.list.5.xml:250 msgid "See Also" msgstr "Véase también" @@ -1656,7 +1657,7 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111 -#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:632 apt-get.8.xml:591 +#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:632 apt-get.8.xml:612 #: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76 msgid "Diagnostics" msgstr "Diagnósticos" @@ -1786,12 +1787,12 @@ msgstr "" "option>. <placeholder type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><title> -#: apt-cdrom.8.xml:94 apt-key.8.xml:158 +#: apt-cdrom.8.xml:94 apt-key.8.xml:161 msgid "Options" msgstr "Opciones" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:540 apt-get.8.xml:345 +#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:540 apt-get.8.xml:356 msgid "<option>-d</option>" msgstr "<option>-d</option>" @@ -1835,7 +1836,7 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cdrom.8.xml:116 apt-get.8.xml:364 +#: apt-cdrom.8.xml:116 apt-get.8.xml:375 msgid "<option>-m</option>" msgstr "<option>-m</option>" @@ -1890,17 +1891,17 @@ msgstr "" "pero encontrará todo el contenido." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cdrom.8.xml:143 apt-get.8.xml:395 +#: apt-cdrom.8.xml:143 apt-get.8.xml:406 msgid "<option>--just-print</option>" msgstr "<option>--just-print</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cdrom.8.xml:144 apt-get.8.xml:397 +#: apt-cdrom.8.xml:144 apt-get.8.xml:408 msgid "<option>--recon</option>" msgstr "<option>--recon</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cdrom.8.xml:145 apt-get.8.xml:398 +#: apt-cdrom.8.xml:145 apt-get.8.xml:409 msgid "<option>--no-act</option>" msgstr "<option>--no-act</option>" @@ -2127,7 +2128,7 @@ msgstr "" "<filename>paquete.config.XXXX</filename>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-extracttemplates.1.xml:63 apt-get.8.xml:504 +#: apt-extracttemplates.1.xml:63 apt-get.8.xml:525 msgid "<option>-t</option>" msgstr "<option>-t</option>" @@ -2404,7 +2405,7 @@ msgstr "" "configuración necesaria." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:145 apt-get.8.xml:287 +#: apt-ftparchive.1.xml:145 apt-get.8.xml:298 msgid "clean" msgstr "clean" @@ -2978,8 +2979,8 @@ msgstr "" "distribución, generalmente es similar a <literal>main contrib non-free</" "literal>." -#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:394 +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:394 apt.conf.5.xml:157 msgid "Architectures" msgstr "Arquitecturas" @@ -3385,8 +3386,8 @@ msgstr "" "con la orden «generate»." #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:617 apt.conf.5.xml:1087 apt_preferences.5.xml:544 -#: sources.list.5.xml:198 +#: apt-ftparchive.1.xml:617 apt.conf.5.xml:1104 apt_preferences.5.xml:544 +#: sources.list.5.xml:209 msgid "Examples" msgstr "Ejemplos" @@ -3437,15 +3438,45 @@ msgstr "" #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> #: apt-get.8.xml:39 +#, fuzzy +#| msgid "" +#| "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> " +#| "<option>-o= <replaceable>config_string</replaceable> </option> </arg> " +#| "<arg> <option>-c= <replaceable>config_file</replaceable> </option> </arg> " +#| "<arg> <option>-t=</option> <arg choice='plain'> " +#| "<replaceable>target_release</replaceable> </arg> </arg> <group choice=" +#| "\"req\"> <arg choice='plain'>update</arg> <arg choice='plain'>upgrade</" +#| "arg> <arg choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-" +#| "upgrade</arg> <arg choice='plain'>install <arg choice=\"plain\" rep=" +#| "\"repeat\"><replaceable>pkg</replaceable> <arg> <group choice='req'> <arg " +#| "choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> " +#| "<arg choice='plain'> /<replaceable>target_release</replaceable> </arg> </" +#| "group> </arg> </arg> </arg> <arg choice='plain'>remove <arg choice=\"plain" +#| "\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg " +#| "choice='plain'>purge <arg choice=\"plain\" rep=\"repeat" +#| "\"><replaceable>pkg</replaceable></arg></arg> <arg choice='plain'>source " +#| "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> <arg> " +#| "<group choice='req'> <arg choice='plain'> " +#| "=<replaceable>pkg_version_number</replaceable> </arg> <arg " +#| "choice='plain'> /<replaceable>target_release</replaceable> </arg> </" +#| "group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice=" +#| "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg " +#| "choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg " +#| "choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg " +#| "choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg " +#| "choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> " +#| "<group choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--" +#| "help</arg> </group> </arg> </group>" msgid "" "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> " "<option>-o= <replaceable>config_string</replaceable> </option> </arg> <arg> " "<option>-c= <replaceable>config_file</replaceable> </option> </arg> <arg> " "<option>-t=</option> <arg choice='plain'> <replaceable>target_release</" -"replaceable> </arg> </arg> <group choice=\"req\"> <arg " -"choice='plain'>update</arg> <arg choice='plain'>upgrade</arg> <arg " -"choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-upgrade</arg> " -"<arg choice='plain'>install <arg choice=\"plain\" rep=\"repeat" +"replaceable> </arg> </arg> <arg> <option>-a=</option> <arg choice='plain'> " +"<replaceable>default_architecture</replaceable> </arg> </arg> <group choice=" +"\"req\"> <arg choice='plain'>update</arg> <arg choice='plain'>upgrade</arg> " +"<arg choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-upgrade</" +"arg> <arg choice='plain'>install <arg choice=\"plain\" rep=\"repeat" "\"><replaceable>pkg</replaceable> <arg> <group choice='req'> <arg " "choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> <arg " "choice='plain'> /<replaceable>target_release</replaceable> </arg> </group> </" @@ -3494,7 +3525,7 @@ msgstr "" "</group> </arg> </group>" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:115 +#: apt-get.8.xml:122 msgid "" "<command>apt-get</command> is the command-line tool for handling packages, " "and may be considered the user's \"back-end\" to other tools using the APT " @@ -3508,12 +3539,12 @@ msgstr "" "&synaptic; y &wajig;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:124 apt-key.8.xml:127 +#: apt-get.8.xml:131 apt-key.8.xml:127 msgid "update" msgstr "update" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:125 +#: apt-get.8.xml:132 msgid "" "<literal>update</literal> is used to resynchronize the package index files " "from their sources. The indexes of available packages are fetched from the " @@ -3537,12 +3568,12 @@ msgstr "" "tamaño de los archivos de paquete." #. type: <tag></tag> -#: apt-get.8.xml:136 guide.sgml:121 +#: apt-get.8.xml:143 guide.sgml:121 msgid "upgrade" msgstr "upgrade" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:137 +#: apt-get.8.xml:144 msgid "" "<literal>upgrade</literal> is used to install the newest versions of all " "packages currently installed on the system from the sources enumerated in " @@ -3567,12 +3598,12 @@ msgstr "" "hay nuevas versiones disponibles." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:149 +#: apt-get.8.xml:156 msgid "dselect-upgrade" msgstr "dselect-upgrade" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:150 +#: apt-get.8.xml:157 msgid "" "<literal>dselect-upgrade</literal> is used in conjunction with the " "traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</" @@ -3589,12 +3620,12 @@ msgstr "" "paquetes antiguos e instalar las nuevas versiones)." #. type: <tag></tag> -#: apt-get.8.xml:159 guide.sgml:140 +#: apt-get.8.xml:166 guide.sgml:140 msgid "dist-upgrade" msgstr "dist-upgrade" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:160 +#: apt-get.8.xml:167 msgid "" "<literal>dist-upgrade</literal> in addition to performing the function of " "<literal>upgrade</literal>, also intelligently handles changing dependencies " @@ -3617,12 +3648,12 @@ msgstr "" "comportamiento para paquetes individuales." #. type: <tag></tag> -#: apt-get.8.xml:172 guide.sgml:131 +#: apt-get.8.xml:179 guide.sgml:131 msgid "install" msgstr "install" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:174 +#: apt-get.8.xml:181 msgid "" "<literal>install</literal> is followed by one or more packages desired for " "installation or upgrading. Each package is a package name, not a fully " @@ -3650,7 +3681,7 @@ msgstr "" "conflictos de apt-get." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:192 +#: apt-get.8.xml:199 msgid "" "A specific version of a package can be selected for installation by " "following the package name with an equals and the version of the package to " @@ -3668,7 +3699,7 @@ msgstr "" "(stable, testing, unstable)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:199 +#: apt-get.8.xml:206 msgid "" "Both of the version selection mechanisms can downgrade packages and must be " "used with care." @@ -3677,7 +3708,7 @@ msgstr "" "anterior de los paquetes y se debe usar con cuidado." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:202 +#: apt-get.8.xml:209 msgid "" "This is also the target to use if you want to upgrade one or more already-" "installed packages without upgrading every package you have on your system. " @@ -3697,7 +3728,7 @@ msgstr "" "instalarán." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:213 +#: apt-get.8.xml:220 msgid "" "Finally, the &apt-preferences; mechanism allows you to create an alternative " "installation policy for individual packages." @@ -3706,7 +3737,7 @@ msgstr "" "paquetes individuales." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:217 +#: apt-get.8.xml:224 msgid "" "If no package matches the given expression and the expression contains one " "of '.', '?' or '*' then it is assumed to be a POSIX regular expression, and " @@ -3726,12 +3757,12 @@ msgstr "" "«$», o bien crear una expresión regular más específica." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:226 +#: apt-get.8.xml:233 msgid "remove" msgstr "remove" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:227 +#: apt-get.8.xml:234 msgid "" "<literal>remove</literal> is identical to <literal>install</literal> except " "that packages are removed instead of installed. Note the removing a package " @@ -3747,12 +3778,12 @@ msgstr "" "cuestión será instalado en vez de eliminado." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:234 +#: apt-get.8.xml:241 msgid "purge" msgstr "purge" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:235 +#: apt-get.8.xml:242 msgid "" "<literal>purge</literal> is identical to <literal>remove</literal> except " "that packages are removed and purged (any configuration files are deleted " @@ -3763,12 +3794,12 @@ msgstr "" "también cualquier fichero de configuración)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:239 +#: apt-get.8.xml:246 msgid "source" msgstr "source" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:240 +#: apt-get.8.xml:247 msgid "" "<literal>source</literal> causes <command>apt-get</command> to fetch source " "packages. APT will examine the available packages to decide which source " @@ -3787,7 +3818,7 @@ msgstr "" "release</literal>, si es posible." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:248 +#: apt-get.8.xml:255 msgid "" "Source packages are tracked separately from binary packages via <literal>deb-" "src</literal> type lines in the &sources-list; file. This means that you " @@ -3803,12 +3834,19 @@ msgstr "" "instalada o de la que podría instalar." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:255 +#: apt-get.8.xml:262 +#, fuzzy +#| msgid "" +#| "If the <option>--compile</option> option is specified then the package " +#| "will be compiled to a binary .deb using <command>dpkg-buildpackage</" +#| "command>, if <option>--download-only</option> is specified then the " +#| "source package will not be unpacked." msgid "" "If the <option>--compile</option> option is specified then the package will " -"be compiled to a binary .deb using <command>dpkg-buildpackage</command>, if " -"<option>--download-only</option> is specified then the source package will " -"not be unpacked." +"be compiled to a binary .deb using <command>dpkg-buildpackage</command> for " +"the architecture as defined by the <command>--host-architecture</command> " +"option. If <option>--download-only</option> is specified then the source " +"package will not be unpacked." msgstr "" "Si se especifica la opción <option>--compile</option> el paquete se " "compilará en un binario «.deb» usando <command>dpkg-buildpackage</command>, " @@ -3816,7 +3854,7 @@ msgstr "" "desempaquetará." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:260 +#: apt-get.8.xml:269 msgid "" "A specific source version can be retrieved by postfixing the source name " "with an equals and then the version to fetch, similar to the mechanism used " @@ -3831,7 +3869,7 @@ msgstr "" "activando implícitamente la opción <literal>APT::Get::Only-Source</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:266 +#: apt-get.8.xml:275 msgid "" "Note that source packages are not tracked like binary packages, they exist " "only in the current directory and are similar to downloading source tar " @@ -3842,27 +3880,34 @@ msgstr "" "tar comprimidos con las fuentes." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:271 +#: apt-get.8.xml:280 msgid "build-dep" msgstr "build-dep" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:272 +#: apt-get.8.xml:281 +#, fuzzy +#| msgid "" +#| "<literal>build-dep</literal> causes apt-get to install/remove packages in " +#| "an attempt to satisfy the build dependencies for a source package." msgid "" "<literal>build-dep</literal> causes apt-get to install/remove packages in an " -"attempt to satisfy the build dependencies for a source package." +"attempt to satisfy the build dependencies for a source package. By default " +"the dependencies are satisfied to build the package natively. If desired a " +"host-architecture can be specified with the <option>--host-architecture</" +"option> option instead." msgstr "" "<literal>build-dep</literal> hace que apt-get instale/desinstale paquetes en " "un intento de satisfacer las dependencias de compilación de un paquete " "fuente." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:276 +#: apt-get.8.xml:287 msgid "check" msgstr "check" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:277 +#: apt-get.8.xml:288 msgid "" "<literal>check</literal> is a diagnostic tool; it updates the package cache " "and checks for broken dependencies." @@ -3871,19 +3916,19 @@ msgstr "" "caché de paquetes y revisa la existencia de dependencias rotas." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:281 +#: apt-get.8.xml:292 msgid "download" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:282 +#: apt-get.8.xml:293 msgid "" "<literal>download</literal> will download the given binary package into the " "current directory." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:288 +#: apt-get.8.xml:299 msgid "" "<literal>clean</literal> clears out the local repository of retrieved " "package files. It removes everything but the lock file from " @@ -3902,12 +3947,12 @@ msgstr "" "literal> de vez en cuando para liberar algo de espacio en disco." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:297 +#: apt-get.8.xml:308 msgid "autoclean" msgstr "autoclean" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:298 +#: apt-get.8.xml:309 msgid "" "Like <literal>clean</literal>, <literal>autoclean</literal> clears out the " "local repository of retrieved package files. The difference is that it only " @@ -3926,28 +3971,33 @@ msgstr "" "desactivada impedirá que se borren los paquetes instalados." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:307 +#: apt-get.8.xml:318 msgid "autoremove" msgstr "autoremove" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:308 +#: apt-get.8.xml:319 +#, fuzzy +#| msgid "" +#| "<literal>autoremove</literal> is used to remove packages that were " +#| "automatically installed to satisfy dependencies for some package and that " +#| "are no more needed." msgid "" "<literal>autoremove</literal> is used to remove packages that were " -"automatically installed to satisfy dependencies for some package and that " -"are no more needed." +"automatically installed to satisfy dependencies for other packages and are " +"now no longer needed." msgstr "" "<literal>autoremove</literal> se usa para desinstalar paquetes que se " "instalaron automáticamente para satisfacer las dependencias de algún " "paquete, pero que ya no son necesarios." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:312 +#: apt-get.8.xml:323 msgid "changelog" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:313 +#: apt-get.8.xml:324 msgid "" "<literal>changelog</literal> downloads a package changelog and displays it " "through <command>sensible-pager</command>. The server name and base " @@ -3960,12 +4010,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:335 +#: apt-get.8.xml:346 msgid "<option>--no-install-recommends</option>" msgstr "<option>--no-install-recommends</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:336 +#: apt-get.8.xml:347 msgid "" "Do not consider recommended packages as a dependency for installing. " "Configuration Item: <literal>APT::Install-Recommends</literal>." @@ -3974,14 +4024,14 @@ msgstr "" "de configuración: <literal>APT::Install-Recommends</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:340 +#: apt-get.8.xml:351 #, fuzzy #| msgid "<option>--no-suggests</option>" msgid "<option>--install-suggests</option>" msgstr "<option>--no-suggests</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:341 +#: apt-get.8.xml:352 #, fuzzy #| msgid "" #| "Do not consider recommended packages as a dependency for installing. " @@ -3994,12 +4044,12 @@ msgstr "" "de configuración: <literal>APT::Install-Recommends</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:345 +#: apt-get.8.xml:356 msgid "<option>--download-only</option>" msgstr "<option>--download-only</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:346 +#: apt-get.8.xml:357 msgid "" "Download only; package files are only retrieved, not unpacked or installed. " "Configuration Item: <literal>APT::Get::Download-Only</literal>." @@ -4008,12 +4058,12 @@ msgstr "" "instala. Opción de configuración: <literal>APT::Get::Download-Only</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:350 +#: apt-get.8.xml:361 msgid "<option>--fix-broken</option>" msgstr "<option>--fix-broken</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:351 +#: apt-get.8.xml:362 msgid "" "Fix; attempt to correct a system with broken dependencies in place. This " "option, when used with install/remove, can omit any packages to permit APT " @@ -4041,17 +4091,17 @@ msgstr "" "<literal>APT::Get::Fix-Broken</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:364 +#: apt-get.8.xml:375 msgid "<option>--ignore-missing</option>" msgstr "<option>--ignore-missing</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:365 +#: apt-get.8.xml:376 msgid "<option>--fix-missing</option>" msgstr "<option>--fix-missing</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:366 +#: apt-get.8.xml:377 msgid "" "Ignore missing packages; If packages cannot be retrieved or fail the " "integrity check after retrieval (corrupted package files), hold back those " @@ -4071,12 +4121,12 @@ msgstr "" "<literal>APT::Get::Fix-Missing</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:376 +#: apt-get.8.xml:387 msgid "<option>--no-download</option>" msgstr "<option>--no-download</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:377 +#: apt-get.8.xml:388 msgid "" "Disables downloading of packages. This is best used with <option>--ignore-" "missing</option> to force APT to use only the .debs it has already " @@ -4088,7 +4138,7 @@ msgstr "" "<literal>APT::Get::Download</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:384 +#: apt-get.8.xml:395 msgid "" "Quiet; produces output suitable for logging, omitting progress indicators. " "More q's will produce more quiet up to a maximum of 2. You can also use " @@ -4109,17 +4159,17 @@ msgstr "" "<literal>quiet</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:394 +#: apt-get.8.xml:405 msgid "<option>--simulate</option>" msgstr "<option>--simulate</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:396 +#: apt-get.8.xml:407 msgid "<option>--dry-run</option>" msgstr "<option>--dry-run</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:399 +#: apt-get.8.xml:410 msgid "" "No action; perform a simulation of events that would occur but do not " "actually change the system. Configuration Item: <literal>APT::Get::" @@ -4130,7 +4180,7 @@ msgstr "" "Simulate</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:403 +#: apt-get.8.xml:414 msgid "" "Simulation run as user will deactivate locking (<literal>Debug::NoLocking</" "literal>) automatic. Also a notice will be displayed indicating that this " @@ -4148,7 +4198,7 @@ msgstr "" "avisos de <literal>apt-get</literal>)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:409 +#: apt-get.8.xml:420 msgid "" "Simulate prints out a series of lines each one representing a dpkg " "operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square brackets " @@ -4162,22 +4212,22 @@ msgstr "" "problema (poco probable)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:416 +#: apt-get.8.xml:427 msgid "<option>-y</option>" msgstr "<option>-y</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:416 +#: apt-get.8.xml:427 msgid "<option>--yes</option>" msgstr "<option>--yes</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:417 +#: apt-get.8.xml:428 msgid "<option>--assume-yes</option>" msgstr "<option>--assume-yes</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:418 +#: apt-get.8.xml:429 msgid "" "Automatic yes to prompts; assume \"yes\" as answer to all prompts and run " "non-interactively. If an undesirable situation, such as changing a held " @@ -4193,17 +4243,17 @@ msgstr "" "<literal>APT::Get::Assume-Yes</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:425 +#: apt-get.8.xml:436 msgid "<option>-u</option>" msgstr "<option>-u</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:425 +#: apt-get.8.xml:436 msgid "<option>--show-upgraded</option>" msgstr "<option>--show-upgraded</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:426 +#: apt-get.8.xml:437 msgid "" "Show upgraded packages; Print out a list of all packages that are to be " "upgraded. Configuration Item: <literal>APT::Get::Show-Upgraded</literal>." @@ -4212,17 +4262,17 @@ msgstr "" "<literal>APT::Get::Show-Upgraded</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:431 +#: apt-get.8.xml:442 msgid "<option>-V</option>" msgstr "<option>-V</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:431 +#: apt-get.8.xml:442 msgid "<option>--verbose-versions</option>" msgstr "<option>--verbose-versions</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:432 +#: apt-get.8.xml:443 msgid "" "Show full versions for upgraded and installed packages. Configuration Item: " "<literal>APT::Get::Show-Versions</literal>." @@ -4231,22 +4281,40 @@ msgstr "" "Opción de configuración: <literal>APT::Get::Show-Versions</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:436 +#: apt-get.8.xml:448 +#, fuzzy +#| msgid "<option>--recurse</option>" +msgid "<option>--host-architecture</option>" +msgstr "<option>--recurse</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:449 +msgid "" +"This option controls the architecture packages are built for by <command>apt-" +"get source --compile</command> and how cross-builddependencies are " +"satisfied. By default is it not set which means that the host architecture " +"is the same as the build architecture (which is defined by <literal>APT::" +"Architecture</literal>). Configuration Item: <literal>APT::Get::Host-" +"Architecture</literal>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:457 msgid "<option>-b</option>" msgstr "<option>-b</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:436 +#: apt-get.8.xml:457 msgid "<option>--compile</option>" msgstr "<option>--compile</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:437 +#: apt-get.8.xml:458 msgid "<option>--build</option>" msgstr "<option>--build</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:438 +#: apt-get.8.xml:459 msgid "" "Compile source packages after downloading them. Configuration Item: " "<literal>APT::Get::Compile</literal>." @@ -4255,12 +4323,12 @@ msgstr "" "<literal>APT::Get::Compile</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:442 +#: apt-get.8.xml:463 msgid "<option>--ignore-hold</option>" msgstr "<option>--ignore-hold</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:443 +#: apt-get.8.xml:464 msgid "" "Ignore package Holds; This causes <command>apt-get</command> to ignore a " "hold placed on a package. This may be useful in conjunction with " @@ -4274,12 +4342,12 @@ msgstr "" "Ignore-Hold</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:449 +#: apt-get.8.xml:470 msgid "<option>--no-upgrade</option>" msgstr "<option>--no-upgrade</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:450 +#: apt-get.8.xml:471 msgid "" "Do not upgrade packages; When used in conjunction with <literal>install</" "literal>, <literal>no-upgrade</literal> will prevent packages on the command " @@ -4292,12 +4360,12 @@ msgstr "" "<literal>APT::Get::Upgrade</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:456 +#: apt-get.8.xml:477 msgid "<option>--only-upgrade</option>" msgstr "<option>--only-upgrade</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:457 +#: apt-get.8.xml:478 msgid "" "Do not install new packages; When used in conjunction with <literal>install</" "literal>, <literal>only-upgrade</literal> will prevent packages on the " @@ -4310,12 +4378,12 @@ msgstr "" "de configuración: <literal>APT::Get::Only-Upgrade</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:463 +#: apt-get.8.xml:484 msgid "<option>--force-yes</option>" msgstr "<option>--force-yes</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:464 +#: apt-get.8.xml:485 msgid "" "Force yes; This is a dangerous option that will cause apt to continue " "without prompting if it is doing something potentially harmful. It should " @@ -4331,12 +4399,12 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:471 +#: apt-get.8.xml:492 msgid "<option>--print-uris</option>" msgstr "<option>--print-uris</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:472 +#: apt-get.8.xml:493 msgid "" "Instead of fetching the files to install their URIs are printed. Each URI " "will have the path, the destination file name, the size and the expected md5 " @@ -4358,12 +4426,12 @@ msgstr "" "<literal>APT::Get::Print-URIs</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:482 +#: apt-get.8.xml:503 msgid "<option>--purge</option>" msgstr "<option>--purge</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:483 +#: apt-get.8.xml:504 msgid "" "Use purge instead of remove for anything that would be removed. An asterisk " "(\"*\") will be displayed next to packages which are scheduled to be purged. " @@ -4377,12 +4445,12 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:490 +#: apt-get.8.xml:511 msgid "<option>--reinstall</option>" msgstr "<option>--reinstall</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:491 +#: apt-get.8.xml:512 msgid "" "Re-Install packages that are already installed and at the newest version. " "Configuration Item: <literal>APT::Get::ReInstall</literal>." @@ -4392,12 +4460,12 @@ msgstr "" "ReInstall</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:495 +#: apt-get.8.xml:516 msgid "<option>--list-cleanup</option>" msgstr "<option>--list-cleanup</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:496 +#: apt-get.8.xml:517 msgid "" "This option defaults to on, use <literal>--no-list-cleanup</literal> to turn " "it off. When on <command>apt-get</command> will automatically manage the " @@ -4415,17 +4483,17 @@ msgstr "" "<literal>APT::Get::List-Cleanup</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:505 +#: apt-get.8.xml:526 msgid "<option>--target-release</option>" msgstr "<option>--target-release</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:506 +#: apt-get.8.xml:527 msgid "<option>--default-release</option>" msgstr "<option>--default-release</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:507 +#: apt-get.8.xml:528 msgid "" "This option controls the default input to the policy engine, it creates a " "default pin at priority 990 using the specified release string. This " @@ -4449,12 +4517,12 @@ msgstr "" "también la página del manual de &apt-preferences;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:520 +#: apt-get.8.xml:541 msgid "<option>--trivial-only</option>" msgstr "<option>--trivial-only</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:522 +#: apt-get.8.xml:543 msgid "" "Only perform operations that are 'trivial'. Logically this can be considered " "related to <option>--assume-yes</option>, where <option>--assume-yes</" @@ -4468,12 +4536,12 @@ msgstr "" "<literal>APT::Get::Trivial-Only</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:528 +#: apt-get.8.xml:549 msgid "<option>--no-remove</option>" msgstr "<option>--no-remove</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:529 +#: apt-get.8.xml:550 msgid "" "If any packages are to be removed apt-get immediately aborts without " "prompting. Configuration Item: <literal>APT::Get::Remove</literal>." @@ -4482,12 +4550,12 @@ msgstr "" "preguntar. Opción de configuración: <literal>APT::Get::Remove</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:534 +#: apt-get.8.xml:555 msgid "<option>--auto-remove</option>" msgstr "<option>--auto-remove</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:535 +#: apt-get.8.xml:556 msgid "" "If the command is either <literal>install</literal> or <literal>remove</" "literal>, then this option acts like running <literal>autoremove</literal> " @@ -4500,12 +4568,12 @@ msgstr "" "configuración: <literal>APT::Get::AutomaticRemove</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:541 +#: apt-get.8.xml:562 msgid "<option>--only-source</option>" msgstr "<option>--only-source</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:542 +#: apt-get.8.xml:563 msgid "" "Only has meaning for the <literal>source</literal> and <literal>build-dep</" "literal> commands. Indicates that the given source names are not to be " @@ -4525,22 +4593,22 @@ msgstr "" "literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:552 +#: apt-get.8.xml:573 msgid "<option>--diff-only</option>" msgstr "<option>--diff-only</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:552 +#: apt-get.8.xml:573 msgid "<option>--dsc-only</option>" msgstr "<option>--dsc-only</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:552 +#: apt-get.8.xml:573 msgid "<option>--tar-only</option>" msgstr "<option>--tar-only</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:553 +#: apt-get.8.xml:574 msgid "" "Download only the diff, dsc, or tar file of a source archive. Configuration " "Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</" @@ -4551,12 +4619,12 @@ msgstr "" "Dsc-Only</literal> y <literal>APT::Get::Tar-Only</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:558 +#: apt-get.8.xml:579 msgid "<option>--arch-only</option>" msgstr "<option>--arch-only</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:559 +#: apt-get.8.xml:580 msgid "" "Only process architecture-dependent build-dependencies. Configuration Item: " "<literal>APT::Get::Arch-Only</literal>." @@ -4565,12 +4633,12 @@ msgstr "" "arquitectura. Opción de configuración: <literal>APT::Get::Arch-Only</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:563 +#: apt-get.8.xml:584 msgid "<option>--allow-unauthenticated</option>" msgstr "<option>--allow-unauthenticated</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:564 +#: apt-get.8.xml:585 msgid "" "Ignore if packages can't be authenticated and don't prompt about it. This " "is useful for tools like pbuilder. Configuration Item: <literal>APT::Get::" @@ -4581,7 +4649,7 @@ msgstr "" "configuración: <literal>APT::Get::AllowUnauthenticated</literal>." #. type: Content of: <refentry><refsect1><variablelist> -#: apt-get.8.xml:577 +#: apt-get.8.xml:598 msgid "" "&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; " "&file-statelists;" @@ -4590,7 +4658,7 @@ msgstr "" "&file-statelists;" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:586 +#: apt-get.8.xml:607 msgid "" "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, " "&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-" @@ -4601,7 +4669,7 @@ msgstr "" "preferences;, el Cómo de APT." #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:592 +#: apt-get.8.xml:613 msgid "" "<command>apt-get</command> returns zero on normal operation, decimal 100 on " "error." @@ -4610,22 +4678,22 @@ msgstr "" "100 en caso de error." #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:595 +#: apt-get.8.xml:616 msgid "ORIGINAL AUTHORS" msgstr "AUTORES ORIGINALES" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:596 +#: apt-get.8.xml:617 msgid "&apt-author.jgunthorpe;" msgstr "&apt-author.jgunthorpe;" #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:599 +#: apt-get.8.xml:620 msgid "CURRENT AUTHORS" msgstr "AUTORES ACTUALES" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:601 +#: apt-get.8.xml:622 msgid "&apt-author.team;" msgstr "&apt-author.team;" @@ -4754,30 +4822,33 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:131 msgid "" -"Update the local keyring with the keyring of Debian archive keys and removes " -"from the keyring the archive keys which are no longer valid." +"Update the local keyring with the archive keyring and remove from the local " +"keyring the archive keys which are no longer valid. The archive keyring is " +"shipped in the <literal>archive-keyring</literal> package of your " +"distribution, e.g. the <literal>debian-archive-keyring</literal> package in " +"Debian." msgstr "" -"Actualiza el registro de claves local con el registro de claves del archivo " -"Debian, y elimina del registro las claves del archivo que ya no son válidas." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:140 +#: apt-key.8.xml:141 #, fuzzy #| msgid "update" msgid "net-update" msgstr "update" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:144 +#: apt-key.8.xml:145 msgid "" -"Update the local keyring with the keys of a key server and removes from the " -"keyring the archive keys which are no longer valid. This requires an " -"installed wget and an APT build configured to have a server to fetch from. " -"APT in Debian does not support this command, but Ubuntu's APT does." +"Work similar to the <command>update</command> command above, but get the " +"archive keyring from an URI instead and validate it against a master key. " +"This requires an installed &wget; and an APT build configured to have a " +"server to fetch from and a master keyring to validate. APT in Debian does " +"not support this command and relies on <command>update</command> instead, " +"but Ubuntu's APT does." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-key.8.xml:159 +#: apt-key.8.xml:162 msgid "" "Note that options need to be defined before the commands described in the " "previous section." @@ -4786,17 +4857,17 @@ msgstr "" "descritas en el sección anterior." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:161 +#: apt-key.8.xml:164 msgid "--keyring <replaceable>filename</replaceable>" msgstr "--keyring <replaceable>nombre-de-fichero</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:162 +#: apt-key.8.xml:165 msgid "" "With this option it is possible to specify a specific keyring file the " "command should operate on. The default is that a command is executed on the " "<filename>trusted.gpg</filename> file as well as on all parts in the " -"<filename>trusted.gpg.d</filename> directory, through <filename>trusted.gpg</" +"<filename>trusted.gpg.d</filename> directory, though <filename>trusted.gpg</" "filename> is the primary keyring which means that e.g. new keys are added to " "this one." msgstr "" @@ -4808,44 +4879,44 @@ msgstr "" "esto es, por ejemplo, que las claves nuevas se añaden a este fichero." #. type: Content of: <refentry><refsect1><variablelist> -#: apt-key.8.xml:175 +#: apt-key.8.xml:178 msgid "&file-trustedgpg;" msgstr "&file-trustedgpg;" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:177 +#: apt-key.8.xml:180 msgid "<filename>/etc/apt/trustdb.gpg</filename>" msgstr "<filename>/etc/apt/trustdb.gpg</filename>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:178 +#: apt-key.8.xml:181 msgid "Local trust database of archive keys." msgstr "Base de datos local de las claves de confianza de archivos Debian" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:181 +#: apt-key.8.xml:184 msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:182 +#: apt-key.8.xml:185 msgid "Keyring of Debian archive trusted keys." msgstr "Registro de las claves de confianza del archivo de Debian." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:185 +#: apt-key.8.xml:188 msgid "" "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" msgstr "" "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:186 +#: apt-key.8.xml:189 msgid "Keyring of Debian archive removed trusted keys." msgstr "Registro de las claves de confianza eliminadas del archivo de Debian." #. type: Content of: <refentry><refsect1><para> -#: apt-key.8.xml:195 +#: apt-key.8.xml:198 msgid "&apt-get;, &apt-secure;" msgstr "&apt-get;, &apt-secure;" @@ -5833,13 +5904,24 @@ msgstr "" "ficheros y analizar las listas de paquetes. El valor predeterminado es la " "arquitectura para la que apt se compiló." +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:158 +msgid "" +"All Architectures the system supports. Processors implementing the " +"<literal>amd64</literal> are e.g. also able to execute binaries compiled for " +"<literal>i386</literal>; This list is use when fetching files and parsing " +"package lists. The internal default is always the native architecture " +"(<literal>APT::Architecture</literal>) and all foreign architectures it can " +"retrieve by calling <command>dpkg --print-foreign-architectures</command>." +msgstr "" + #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:157 +#: apt.conf.5.xml:165 msgid "Default-Release" msgstr "Default-Release" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:158 +#: apt.conf.5.xml:166 msgid "" "Default release to install packages from if more than one version available. " "Contains release name, codename or release version. Examples: 'stable', " @@ -5853,12 +5935,12 @@ msgstr "" "«5.0*». Vea también &apt-preferences;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:163 +#: apt.conf.5.xml:171 msgid "Ignore-Hold" msgstr "Ignore-Hold" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:164 +#: apt.conf.5.xml:172 msgid "" "Ignore Held packages; This global option causes the problem resolver to " "ignore held packages in its decision making." @@ -5867,12 +5949,12 @@ msgstr "" "problemas ignore los paquetes retenidos en la toma de decisiones." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:168 +#: apt.conf.5.xml:176 msgid "Clean-Installed" msgstr "Clean-Installed" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:169 +#: apt.conf.5.xml:177 msgid "" "Defaults to on. When turned on the autoclean feature will remove any " "packages which can no longer be downloaded from the cache. If turned off " @@ -5886,12 +5968,12 @@ msgstr "" "mecanismo directo para reinstalarlos." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:175 +#: apt.conf.5.xml:183 msgid "Immediate-Configure" msgstr "Immediate-Configure" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:176 +#: apt.conf.5.xml:184 msgid "" "Defaults to on which will cause APT to install essential and important " "packages as fast as possible in the install/upgrade operation. This is done " @@ -5955,12 +6037,12 @@ msgstr "" "actualización." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:198 +#: apt.conf.5.xml:206 msgid "Force-LoopBreak" msgstr "Force-LoopBreak" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:199 +#: apt.conf.5.xml:207 msgid "" "Never Enable this option unless you -really- know what you are doing. It " "permits APT to temporarily remove an essential package to break a Conflicts/" @@ -5977,12 +6059,12 @@ msgstr "" "libc, ni dpkg, ni bash, ni cualquier otro del que dependan estos paquetes." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:207 +#: apt.conf.5.xml:215 msgid "Cache-Start, Cache-Grow and Cache-Limit" msgstr "Cache-Start, Cache-Grow y Cache-Limit" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:208 +#: apt.conf.5.xml:216 msgid "" "APT uses since version 0.7.26 a resizable memory mapped cache file to store " "the 'available' information. <literal>Cache-Start</literal> acts as a hint " @@ -6019,23 +6101,23 @@ msgstr "" "crecimiento automático del cache." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:223 +#: apt.conf.5.xml:231 msgid "Build-Essential" msgstr "Build-Essential" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:224 +#: apt.conf.5.xml:232 msgid "Defines which package(s) are considered essential build dependencies." msgstr "" "Define qué paquete(s) se consideran dependencias de creación esenciales." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:227 +#: apt.conf.5.xml:235 msgid "Get" msgstr "Get" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:228 +#: apt.conf.5.xml:236 msgid "" "The Get subsection controls the &apt-get; tool, please see its documentation " "for more information about the options here." @@ -6044,12 +6126,12 @@ msgstr "" "documentación para más información sobre esta opción." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:232 +#: apt.conf.5.xml:240 msgid "Cache" msgstr "Cache" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:233 +#: apt.conf.5.xml:241 msgid "" "The Cache subsection controls the &apt-cache; tool, please see its " "documentation for more information about the options here." @@ -6058,12 +6140,12 @@ msgstr "" "la documentación para más información sobre esta opción." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:237 +#: apt.conf.5.xml:245 msgid "CDROM" msgstr "CDROM" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:238 +#: apt.conf.5.xml:246 msgid "" "The CDROM subsection controls the &apt-cdrom; tool, please see its " "documentation for more information about the options here." @@ -6072,17 +6154,17 @@ msgstr "" "la documentación para más información sobre esta opción." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:244 +#: apt.conf.5.xml:252 msgid "The Acquire Group" msgstr "El grupo Acquire" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:249 +#: apt.conf.5.xml:257 msgid "Check-Valid-Until" msgstr "Check-Valid-Until" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:250 +#: apt.conf.5.xml:258 msgid "" "Security related option defaulting to true as an expiring validation for a " "Release file prevents longtime replay attacks and can e.g. also help users " @@ -6102,22 +6184,30 @@ msgstr "" "<literal>Max-ValidTime</literal>." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:260 +#: apt.conf.5.xml:268 msgid "Max-ValidTime" msgstr "Max-ValidTime" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:261 -msgid "" -"Seconds the Release file should be considered valid after it was created. " -"The default is \"for ever\" (0) if the Release file of the archive doesn't " -"include a <literal>Valid-Until</literal> header. If it does then this date " -"is the default. The date from the Release file or the date specified by the " -"creation time of the Release file (<literal>Date</literal> header) plus the " -"seconds specified with this options are used to check if the validation of a " -"file has expired by using the earlier date of the two. Archive specific " -"settings can be made by appending the label of the archive to the option " -"name." +#: apt.conf.5.xml:269 +#, fuzzy +#| msgid "" +#| "Seconds the Release file should be considered valid after it was created. " +#| "The default is \"for ever\" (0) if the Release file of the archive " +#| "doesn't include a <literal>Valid-Until</literal> header. If it does then " +#| "this date is the default. The date from the Release file or the date " +#| "specified by the creation time of the Release file (<literal>Date</" +#| "literal> header) plus the seconds specified with this options are used to " +#| "check if the validation of a file has expired by using the earlier date " +#| "of the two. Archive specific settings can be made by appending the label " +#| "of the archive to the option name." +msgid "" +"Seconds the Release file should be considered valid after it was created " +"(indicated by the <literal>Date</literal> header). If the Release file " +"itself includes a <literal>Valid-Until</literal> header the earlier date of " +"the two is used as the expiration date. The default value is <literal>0</" +"literal> which stands for \"for ever\". Archive specific settings can be " +"made by appending the label of the archive to the option name." msgstr "" "Los segundos que el fichero «Release» se considerará válido después de su " "creación. El valor predeterminado es «para siempre» (cero) si el fichero " @@ -6132,12 +6222,52 @@ msgstr "" "opción." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:273 +#: apt.conf.5.xml:279 +#, fuzzy +#| msgid "Max-ValidTime" +msgid "Min-ValidTime" +msgstr "Max-ValidTime" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:280 +#, fuzzy +#| msgid "" +#| "Seconds the Release file should be considered valid after it was created. " +#| "The default is \"for ever\" (0) if the Release file of the archive " +#| "doesn't include a <literal>Valid-Until</literal> header. If it does then " +#| "this date is the default. The date from the Release file or the date " +#| "specified by the creation time of the Release file (<literal>Date</" +#| "literal> header) plus the seconds specified with this options are used to " +#| "check if the validation of a file has expired by using the earlier date " +#| "of the two. Archive specific settings can be made by appending the label " +#| "of the archive to the option name." +msgid "" +"Minimum of seconds the Release file should be considered valid after it was " +"created (indicated by the <literal>Date</literal> header). Use this if you " +"need to use a seldomly updated (local) mirror of a more regular updated " +"archive with a <literal>Valid-Until</literal> header instead of completely " +"disabling the expiration date checking. Archive specific settings can and " +"should be used by appending the label of the archive to the option name." +msgstr "" +"Los segundos que el fichero «Release» se considerará válido después de su " +"creación. El valor predeterminado es «para siempre» (cero) si el fichero " +"«Release» del archivo no incluye una cabecera <literal>Valid-Until</" +"literal>. Si lo incluye, el valor predeterminado es esta fecha. La fecha del " +"fichero «Release» o la fecha definida por la hora de creación del fichero " +"«Release» (cabecera <literal>Date</literal>), a lo que se añaden los " +"segundos definidos con estas opciones, se usan para comprobar si la validez " +"de un fichero a expirado, usando la fecha más antigua de las dos " +"anteriormente mencionadas. Se pueden definir opciones de configuración " +"específicas al archivo añadiendo la etiqueta del archivo al nombre de la " +"opción." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: apt.conf.5.xml:290 msgid "PDiffs" msgstr "PDiffs" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:274 +#: apt.conf.5.xml:291 msgid "" "Try to download deltas called <literal>PDiffs</literal> for Packages or " "Sources files instead of downloading whole ones. True by default." @@ -6147,7 +6277,7 @@ msgstr "" "predeterminada" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:277 +#: apt.conf.5.xml:294 msgid "" "Two sub-options to limit the use of PDiffs are also available: With " "<literal>FileLimit</literal> can be specified how many PDiff files are " @@ -6164,12 +6294,12 @@ msgstr "" "estos límites, se descargará el fichero completo en lugar de los parches." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:286 +#: apt.conf.5.xml:303 msgid "Queue-Mode" msgstr "Queue-Mode" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:287 +#: apt.conf.5.xml:304 msgid "" "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</" "literal> or <literal>access</literal> which determines how APT parallelizes " @@ -6184,12 +6314,12 @@ msgstr "" "se abrirá una conexión por cada tipo de URI." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:294 +#: apt.conf.5.xml:311 msgid "Retries" msgstr "Retries" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:295 +#: apt.conf.5.xml:312 msgid "" "Number of retries to perform. If this is non-zero APT will retry failed " "files the given number of times." @@ -6198,12 +6328,12 @@ msgstr "" "intentar obtener los ficheros fallidos el número de veces proporcionado." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:299 +#: apt.conf.5.xml:316 msgid "Source-Symlinks" msgstr "Source-Symlinks" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:300 +#: apt.conf.5.xml:317 msgid "" "Use symlinks for source archives. If set to true then source archives will " "be symlinked when possible instead of copying. True is the default." @@ -6213,12 +6343,12 @@ msgstr "" "forma predeterminada." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:304 sources.list.5.xml:144 +#: apt.conf.5.xml:321 sources.list.5.xml:155 msgid "http" msgstr "http" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:305 +#: apt.conf.5.xml:322 msgid "" "HTTP URIs; http::Proxy is the default http proxy to use. It is in the " "standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per " @@ -6236,7 +6366,7 @@ msgstr "" "definir ninguna de las opciones anteriores." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:313 +#: apt.conf.5.xml:330 msgid "" "Three settings are provided for cache control with HTTP/1.1 compliant proxy " "caches. <literal>No-Cache</literal> tells the proxy to not use its cached " @@ -6261,7 +6391,7 @@ msgstr "" "grandes. Aviso: Squid 2.0.2 no permite usar ninguna de estas opciones." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:323 apt.conf.5.xml:387 +#: apt.conf.5.xml:340 apt.conf.5.xml:404 msgid "" "The option <literal>timeout</literal> sets the timeout timer used by the " "method, this applies to all things including connection timeout and data " @@ -6272,7 +6402,7 @@ msgstr "" "realizar la conexión y para recibir datos." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:326 +#: apt.conf.5.xml:343 msgid "" "One setting is provided to control the pipeline depth in cases where the " "remote server is not RFC conforming or buggy (such as Squid 2.0.2). " @@ -6291,7 +6421,7 @@ msgstr "" "necesitan esto violan la RFC 2068." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:334 +#: apt.conf.5.xml:351 msgid "" "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</" "literal> which accepts integer values in kilobyte. The default value is 0 " @@ -6306,7 +6436,7 @@ msgstr "" "implícitamente la descarga simultánea desde varios servidores)." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:339 +#: apt.conf.5.xml:356 msgid "" "<literal>Acquire::http::User-Agent</literal> can be used to set a different " "User-Agent for the http download method as some proxies allow access for " @@ -6317,12 +6447,12 @@ msgstr "" "permiten el acceso para clientes que usan un identificador conocido." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:345 +#: apt.conf.5.xml:362 msgid "https" msgstr "https" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:346 +#: apt.conf.5.xml:363 msgid "" "HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy " "options are the same as for <literal>http</literal> method and will also " @@ -6337,7 +6467,7 @@ msgstr "" "opción <literal>Pipeline-Depth</literal> no se puede usar por ahora." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:352 +#: apt.conf.5.xml:369 msgid "" "<literal>CaInfo</literal> suboption specifies place of file that holds info " "about trusted certificates. <literal><host>::CaInfo</literal> is " @@ -6374,12 +6504,12 @@ msgstr "" "corresponde a la opción por máquina." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:370 sources.list.5.xml:155 +#: apt.conf.5.xml:387 sources.list.5.xml:166 msgid "ftp" msgstr "ftp" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:371 +#: apt.conf.5.xml:388 msgid "" "FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard " "form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host " @@ -6413,7 +6543,7 @@ msgstr "" "URI." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:390 +#: apt.conf.5.xml:407 msgid "" "Several settings are provided to control passive mode. Generally it is safe " "to leave passive mode on, it works in nearly every environment. However " @@ -6429,7 +6559,7 @@ msgstr "" "fichero de configuración de muestra para ver algunos ejemplos)." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:397 +#: apt.conf.5.xml:414 msgid "" "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</" "envar> environment variable to a http url - see the discussion of the http " @@ -6443,7 +6573,7 @@ msgstr "" "de http debido a su poca eficiencia." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:402 +#: apt.conf.5.xml:419 msgid "" "The setting <literal>ForceExtended</literal> controls the use of RFC2428 " "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is " @@ -6459,18 +6589,18 @@ msgstr "" "compatibles con la RFC 2428." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:409 sources.list.5.xml:137 +#: apt.conf.5.xml:426 sources.list.5.xml:148 msgid "cdrom" msgstr "cdrom" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:415 +#: apt.conf.5.xml:432 #, no-wrap msgid "/cdrom/::Mount \"foo\";" msgstr "/cdrom/::Mount \"algo\";" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:410 +#: apt.conf.5.xml:427 msgid "" "CDROM URIs; the only setting for CDROM URIs is the mount point, " "<literal>cdrom::Mount</literal> which must be the mount point for the CDROM " @@ -6492,12 +6622,12 @@ msgstr "" "para desmontar usando UMount." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:420 +#: apt.conf.5.xml:437 msgid "gpgv" msgstr "gpgv" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:421 +#: apt.conf.5.xml:438 msgid "" "GPGV URIs; the only option for GPGV URIs is the option to pass additional " "parameters to gpgv. <literal>gpgv::Options</literal> Additional options " @@ -6508,18 +6638,18 @@ msgstr "" "introducidos a gpgv." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:426 +#: apt.conf.5.xml:443 msgid "CompressionTypes" msgstr "CompressionTypes" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:432 +#: apt.conf.5.xml:449 #, no-wrap msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";" msgstr "Acquire::CompressionTypes::<replaceable>extensión-del-fichero</replaceable> \"<replaceable>nombre-del-método</replaceable>\";" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:427 +#: apt.conf.5.xml:444 msgid "" "List of compression types which are understood by the acquire methods. " "Files like <filename>Packages</filename> can be available in various " @@ -6539,19 +6669,19 @@ msgstr "" "\"0\"/>" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:437 +#: apt.conf.5.xml:454 #, no-wrap msgid "Acquire::CompressionTypes::Order:: \"gz\";" msgstr "Acquire::CompressionTypes::Order:: \"gz\";" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:440 +#: apt.conf.5.xml:457 #, no-wrap msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:433 +#: apt.conf.5.xml:450 msgid "" "Also the <literal>Order</literal> subgroup can be used to define in which " "order the acquire system will try to download the compressed files. The " @@ -6582,13 +6712,13 @@ msgstr "" "lista ya que se añadirá de forma automática." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:444 +#: apt.conf.5.xml:461 #, no-wrap msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:442 +#: apt.conf.5.xml:459 #, fuzzy #| msgid "" #| "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</" @@ -6626,7 +6756,7 @@ msgstr "" "lista definida, sólo añadirá este tipo al principio de la lista." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:449 +#: apt.conf.5.xml:466 msgid "" "The special type <literal>uncompressed</literal> can be used to give " "uncompressed files a preference, but note that most archives don't provide " @@ -6634,12 +6764,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:454 +#: apt.conf.5.xml:471 msgid "GzipIndexes" msgstr "GzipIndexes" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:456 +#: apt.conf.5.xml:473 msgid "" "When downloading <literal>gzip</literal> compressed indexes (Packages, " "Sources, or Translations), keep them gzip compressed locally instead of " @@ -6653,12 +6783,12 @@ msgstr "" "paquetes locales. El valor predeterminado es «false»." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:463 +#: apt.conf.5.xml:480 msgid "Languages" msgstr "Languages" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:464 +#: apt.conf.5.xml:481 msgid "" "The Languages subsection controls which <filename>Translation</filename> " "files are downloaded and in which order APT tries to display the Description-" @@ -6679,13 +6809,13 @@ msgstr "" "informarse de cuales están disponibles antes de definir valores imposibles." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting> -#: apt.conf.5.xml:480 +#: apt.conf.5.xml:497 #, no-wrap msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" msgstr "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; }" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:470 +#: apt.conf.5.xml:487 msgid "" "The default list includes \"environment\" and \"en\". " "\"<literal>environment</literal>\" has a special meaning here: It will be " @@ -6727,7 +6857,7 @@ msgstr "" "\"0\"/>" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:245 +#: apt.conf.5.xml:253 msgid "" "The <literal>Acquire</literal> group of options controls the download of " "packages and the URI handlers. <placeholder type=\"variablelist\" id=\"0\"/>" @@ -6736,12 +6866,12 @@ msgstr "" "paquetes y los gestores de URI. <placeholder type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:487 +#: apt.conf.5.xml:504 msgid "Directories" msgstr "Directorios" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:489 +#: apt.conf.5.xml:506 msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " "local state information. <literal>lists</literal> is the directory to place " @@ -6761,7 +6891,7 @@ msgstr "" "empiecen con <filename>/</filename> ó <filename>./</filename>." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:496 +#: apt.conf.5.xml:513 msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " "information, such as the two package caches <literal>srcpkgcache</literal> " @@ -6783,7 +6913,7 @@ msgstr "" "predeterminado está en <literal>Dir::Cache</literal>" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:505 +#: apt.conf.5.xml:522 msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " "<literal>sourcelist</literal> gives the location of the sourcelist and " @@ -6799,7 +6929,7 @@ msgstr "" "<envar>APT_CONFIG</envar>)." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:511 +#: apt.conf.5.xml:528 msgid "" "The <literal>Dir::Parts</literal> setting reads in all the config fragments " "in lexical order from the directory specified. After this is done then the " @@ -6810,7 +6940,7 @@ msgstr "" "Al finalizar este proceso carga el fichero de configuración principal." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:515 +#: apt.conf.5.xml:532 msgid "" "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::" "Bin::Methods</literal> specifies the location of the method handlers and " @@ -6827,7 +6957,7 @@ msgstr "" "literal> especifican la ubicación de sus respectivos programas." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:523 +#: apt.conf.5.xml:540 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@ -6848,7 +6978,7 @@ msgstr "" "staging/var/lib/dpkg/status</filename>." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:536 +#: apt.conf.5.xml:553 msgid "" "The <literal>Ignore-Files-Silently</literal> list can be used to specify " "which files APT should silently ignore while parsing the files in the " @@ -6866,12 +6996,12 @@ msgstr "" "de expresiones regulares." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:545 +#: apt.conf.5.xml:562 msgid "APT in DSelect" msgstr "APT con DSelect" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:547 +#: apt.conf.5.xml:564 msgid "" "When APT is used as a &dselect; method several configuration directives " "control the default behaviour. These are in the <literal>DSelect</literal> " @@ -6882,12 +7012,12 @@ msgstr "" "encuentran en la sección <literal>DSelect</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:551 +#: apt.conf.5.xml:568 msgid "Clean" msgstr "Clean" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:552 +#: apt.conf.5.xml:569 msgid "" "Cache Clean mode; this value may be one of always, prompt, auto, pre-auto " "and never. always and prompt will remove all packages from the cache after " @@ -6905,7 +7035,7 @@ msgstr "" "descargar los paquetes nuevos." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:561 +#: apt.conf.5.xml:578 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the install phase." @@ -6914,12 +7044,12 @@ msgstr "" "la línea de ordenes al ejecutar la fase de instalación." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:565 +#: apt.conf.5.xml:582 msgid "Updateoptions" msgstr "Updateoptions" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:566 +#: apt.conf.5.xml:583 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the update phase." @@ -6928,12 +7058,12 @@ msgstr "" "la línea de ordenes al ejecutar la fase de actualización." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:570 +#: apt.conf.5.xml:587 msgid "PromptAfterUpdate" msgstr "PromptAfterUpdate" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:571 +#: apt.conf.5.xml:588 msgid "" "If true the [U]pdate operation in &dselect; will always prompt to continue. " "The default is to prompt only on error." @@ -6943,12 +7073,12 @@ msgstr "" "preguntará en caso de error." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:577 +#: apt.conf.5.xml:594 msgid "How APT calls dpkg" msgstr "Cómo invoca APT a dpkg" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:578 +#: apt.conf.5.xml:595 msgid "" "Several configuration directives control how APT invokes &dpkg;. These are " "in the <literal>DPkg</literal> section." @@ -6957,7 +7087,7 @@ msgstr "" "se encuentran en la sección <literal>DPkg</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:583 +#: apt.conf.5.xml:600 msgid "" "This is a list of options to pass to dpkg. The options must be specified " "using the list notation and each list item is passed as a single argument to " @@ -6968,17 +7098,17 @@ msgstr "" "introduce a &dpkg; como un sólo argumento." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:588 +#: apt.conf.5.xml:605 msgid "Pre-Invoke" msgstr "Pre-Invoke" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:588 +#: apt.conf.5.xml:605 msgid "Post-Invoke" msgstr "Post-Invoke" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:589 +#: apt.conf.5.xml:606 msgid "" "This is a list of shell commands to run before/after invoking &dpkg;. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -6991,12 +7121,12 @@ msgstr "" "sh</filename>, y APT finalizará en caso de fallo." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:595 +#: apt.conf.5.xml:612 msgid "Pre-Install-Pkgs" msgstr "Pre-Install-Pkgs" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:596 +#: apt.conf.5.xml:613 msgid "" "This is a list of shell commands to run before invoking dpkg. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -7012,7 +7142,7 @@ msgstr "" "instalar, uno por línea." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:602 +#: apt.conf.5.xml:619 msgid "" "Version 2 of this protocol dumps more information, including the protocol " "version, the APT configuration space and the packages, files and versions " @@ -7028,12 +7158,12 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:609 +#: apt.conf.5.xml:626 msgid "Run-Directory" msgstr "Run-Directory" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:610 +#: apt.conf.5.xml:627 msgid "" "APT chdirs to this directory before invoking dpkg, the default is <filename>/" "</filename>." @@ -7042,12 +7172,12 @@ msgstr "" "predeterminado es <filename>/</filename>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:614 +#: apt.conf.5.xml:631 msgid "Build-options" msgstr "Build-options" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:615 +#: apt.conf.5.xml:632 msgid "" "These options are passed to &dpkg-buildpackage; when compiling packages, the " "default is to disable signing and produce all binaries." @@ -7057,12 +7187,12 @@ msgstr "" "paquetes y a producir todos los binarios." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt.conf.5.xml:620 +#: apt.conf.5.xml:637 msgid "dpkg trigger usage (and related options)" msgstr "Uso del disparador de dpkg (y de las opciones relacionadas)" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:621 +#: apt.conf.5.xml:638 #, fuzzy #| msgid "" #| "APT can call dpkg in a way so it can make aggressive use of triggers over " @@ -7101,7 +7231,7 @@ msgstr "" "mientras se están configurando todos los paquetes." #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> -#: apt.conf.5.xml:636 +#: apt.conf.5.xml:653 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@ -7115,7 +7245,7 @@ msgstr "" "DPkg::TriggersPending \"true\";" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:630 +#: apt.conf.5.xml:647 msgid "" "Note that it is not guaranteed that APT will support these options or that " "these options will not cause (big) trouble in the future. If you have " @@ -7139,12 +7269,12 @@ msgstr "" "\"literallayout\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:642 +#: apt.conf.5.xml:659 msgid "DPkg::NoTriggers" msgstr "DPkg::NoTriggers" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:643 +#: apt.conf.5.xml:660 msgid "" "Add the no triggers flag to all dpkg calls (except the ConfigurePending " "call). See &dpkg; if you are interested in what this actually means. In " @@ -7165,12 +7295,12 @@ msgstr "" "añadirá esta opción a las llamadas de desempaquetado y borrado." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:650 +#: apt.conf.5.xml:667 msgid "PackageManager::Configure" msgstr "PackageManager::Configure" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:651 +#: apt.conf.5.xml:668 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default " @@ -7199,12 +7329,12 @@ msgstr "" "sistema. " #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:661 +#: apt.conf.5.xml:678 msgid "DPkg::ConfigurePending" msgstr "DPkg::ConfigurePending" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:662 +#: apt.conf.5.xml:679 msgid "" "If this option is set apt will call <command>dpkg --configure --pending</" "command> to let dpkg handle all required configurations and triggers. This " @@ -7222,12 +7352,12 @@ msgstr "" "desactivar esta opción en todas las ejecuciones menos la última." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:668 +#: apt.conf.5.xml:685 msgid "DPkg::TriggersPending" msgstr "DPkg::TriggersPending" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:669 +#: apt.conf.5.xml:686 msgid "" "Useful for <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal> and dpkg " @@ -7243,12 +7373,12 @@ msgstr "" "necesarios para configurar este paquete." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:674 +#: apt.conf.5.xml:691 msgid "PackageManager::UnpackAll" msgstr "PackageManager::UnpackAll" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:675 +#: apt.conf.5.xml:692 msgid "" "As the configuration can be deferred to be done at the end by dpkg it can be " "tried to order the unpack series only by critical needs, e.g. by Pre-" @@ -7268,12 +7398,12 @@ msgstr "" "ser realmente útil." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:682 +#: apt.conf.5.xml:699 msgid "OrderList::Score::Immediate" msgstr "OrderList::Score::Immediate" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:690 +#: apt.conf.5.xml:707 #, no-wrap msgid "" "OrderList::Score {\n" @@ -7291,7 +7421,7 @@ msgstr "" "};" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:683 +#: apt.conf.5.xml:700 msgid "" "Essential packages (and there dependencies) should be configured immediately " "after unpacking. It will be a good idea to do this quite early in the " @@ -7316,12 +7446,12 @@ msgstr "" "\"literallayout\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:703 +#: apt.conf.5.xml:720 msgid "Periodic and Archives options" msgstr "Las opciones «Periodic» y «Archives»" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:704 +#: apt.conf.5.xml:721 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by " @@ -7335,12 +7465,12 @@ msgstr "" "documentación de estas opciones." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:712 +#: apt.conf.5.xml:729 msgid "Debug options" msgstr "Opciones de depuración" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:714 +#: apt.conf.5.xml:731 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@ -7357,7 +7487,7 @@ msgstr "" "para un usuario normal, aunque unas cuantas sí son:" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:725 +#: apt.conf.5.xml:742 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</" @@ -7368,7 +7498,7 @@ msgstr "" "purge</literal>." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:733 +#: apt.conf.5.xml:750 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s install</" @@ -7379,7 +7509,7 @@ msgstr "" "<literal>apt-get -s install</literal>) como un usuario normal." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:742 +#: apt.conf.5.xml:759 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@ -7391,7 +7521,7 @@ msgstr "" #. motivating example, except I haven't a clue why you'd want #. to do this. #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:750 +#: apt.conf.5.xml:767 msgid "" "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " "in CDROM IDs." @@ -7400,19 +7530,19 @@ msgstr "" "statfs en los identificadores de los CDROM." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:760 +#: apt.conf.5.xml:777 msgid "A full list of debugging options to apt follows." msgstr "" "A continuación, se muestra la lista completa de las opciones de depuración " "de apt." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:765 +#: apt.conf.5.xml:782 msgid "<literal>Debug::Acquire::cdrom</literal>" msgstr "<literal>Debug::Acquire::cdrom</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:769 +#: apt.conf.5.xml:786 msgid "" "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" @@ -7420,46 +7550,46 @@ msgstr "" "<literal>cdrom://</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:776 +#: apt.conf.5.xml:793 msgid "<literal>Debug::Acquire::ftp</literal>" msgstr "<literal>Debug::Acquire::ftp</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:780 +#: apt.conf.5.xml:797 msgid "Print information related to downloading packages using FTP." msgstr "" "Muestra la información relacionada con la descarga de paquetes mediante FTP." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:787 +#: apt.conf.5.xml:804 msgid "<literal>Debug::Acquire::http</literal>" msgstr "<literal>Debug::Acquire::http</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:791 +#: apt.conf.5.xml:808 msgid "Print information related to downloading packages using HTTP." msgstr "" "Muestra la información relacionada con la descarga de paquetes mediante HTTP." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:798 +#: apt.conf.5.xml:815 msgid "<literal>Debug::Acquire::https</literal>" msgstr "<literal>Debug::Acquire::https</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:802 +#: apt.conf.5.xml:819 msgid "Print information related to downloading packages using HTTPS." msgstr "" "Muestra la información relacionada con la descarga de paquetes mediante " "HTTPS." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:809 +#: apt.conf.5.xml:826 msgid "<literal>Debug::Acquire::gpgv</literal>" msgstr "<literal>Debug::Acquire::gpgv</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:813 +#: apt.conf.5.xml:830 msgid "" "Print information related to verifying cryptographic signatures using " "<literal>gpg</literal>." @@ -7468,12 +7598,12 @@ msgstr "" "criptográficas mediante <literal>gpg</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:820 +#: apt.conf.5.xml:837 msgid "<literal>Debug::aptcdrom</literal>" msgstr "<literal>Debug::aptcdrom</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:824 +#: apt.conf.5.xml:841 msgid "" "Output information about the process of accessing collections of packages " "stored on CD-ROMs." @@ -7482,24 +7612,24 @@ msgstr "" "paquetes almacenadas en CD-ROM." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:831 +#: apt.conf.5.xml:848 msgid "<literal>Debug::BuildDeps</literal>" msgstr "<literal>Debug::BuildDeps</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:834 +#: apt.conf.5.xml:851 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" "Describe el proceso de resolución de dependencias de compilación en &apt-" "get;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:841 +#: apt.conf.5.xml:858 msgid "<literal>Debug::Hashes</literal>" msgstr "<literal>Debug::Hashes</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:844 +#: apt.conf.5.xml:861 msgid "" "Output each cryptographic hash that is generated by the <literal>apt</" "literal> libraries." @@ -7508,12 +7638,12 @@ msgstr "" "<literal>apt</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:851 +#: apt.conf.5.xml:868 msgid "<literal>Debug::IdentCDROM</literal>" msgstr "<literal>Debug::IdentCDROM</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:854 +#: apt.conf.5.xml:871 msgid "" "Do not include information from <literal>statfs</literal>, namely the number " "of used and free blocks on the CD-ROM filesystem, when generating an ID for " @@ -7524,12 +7654,12 @@ msgstr "" "identificador de un CD-ROM." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:862 +#: apt.conf.5.xml:879 msgid "<literal>Debug::NoLocking</literal>" msgstr "<literal>Debug::NoLocking</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:865 +#: apt.conf.5.xml:882 msgid "" "Disable all file locking. For instance, this will allow two instances of " "<quote><literal>apt-get update</literal></quote> to run at the same time." @@ -7539,24 +7669,24 @@ msgstr "" "a la vez." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:873 +#: apt.conf.5.xml:890 msgid "<literal>Debug::pkgAcquire</literal>" msgstr "<literal>Debug::pkgAcquire</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:877 +#: apt.conf.5.xml:894 msgid "Log when items are added to or removed from the global download queue." msgstr "" "Registra los elementos que se añaden o se borran de la cola de descarga " "global." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:884 +#: apt.conf.5.xml:901 msgid "<literal>Debug::pkgAcquire::Auth</literal>" msgstr "<literal>Debug::pkgAcquire::Auth</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:887 +#: apt.conf.5.xml:904 msgid "" "Output status messages and errors related to verifying checksums and " "cryptographic signatures of downloaded files." @@ -7566,12 +7696,12 @@ msgstr "" "ficheros descargados." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:894 +#: apt.conf.5.xml:911 msgid "<literal>Debug::pkgAcquire::Diffs</literal>" msgstr "<literal>Debug::pkgAcquire::Diffs</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:897 +#: apt.conf.5.xml:914 msgid "" "Output information about downloading and applying package index list diffs, " "and errors relating to package index list diffs." @@ -7580,12 +7710,12 @@ msgstr "" "lista de índices de paquetes, y los errores relacionados con éstos." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:905 +#: apt.conf.5.xml:922 msgid "<literal>Debug::pkgAcquire::RRed</literal>" msgstr "<literal>Debug::pkgAcquire::RRed</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:909 +#: apt.conf.5.xml:926 msgid "" "Output information related to patching apt package lists when downloading " "index diffs instead of full indices." @@ -7595,12 +7725,12 @@ msgstr "" "índices completos." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:916 +#: apt.conf.5.xml:933 msgid "<literal>Debug::pkgAcquire::Worker</literal>" msgstr "<literal>Debug::pkgAcquire::Worker</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:920 +#: apt.conf.5.xml:937 msgid "" "Log all interactions with the sub-processes that actually perform downloads." msgstr "" @@ -7608,12 +7738,12 @@ msgstr "" "descargas." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:927 +#: apt.conf.5.xml:944 msgid "<literal>Debug::pkgAutoRemove</literal>" msgstr "<literal>Debug::pkgAutoRemove</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:931 +#: apt.conf.5.xml:948 msgid "" "Log events related to the automatically-installed status of packages and to " "the removal of unused packages." @@ -7622,12 +7752,12 @@ msgstr "" "de los paquetes y con la eliminación de los paquetes sin usar." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:938 +#: apt.conf.5.xml:955 msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>" msgstr "<literal>Debug::pkgDepCache::AutoInstall</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:941 +#: apt.conf.5.xml:958 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial auto-" @@ -7642,12 +7772,12 @@ msgstr "" "<literal>apt</literal>. Véase <literal>Debug::pkgProblemResolver</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:952 +#: apt.conf.5.xml:969 msgid "<literal>Debug::pkgDepCache::Marker</literal>" msgstr "<literal>Debug::pkgDepCache::Marker</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:955 +#: apt.conf.5.xml:972 msgid "" "Generate debug messages describing which package is marked as keep/install/" "remove while the ProblemResolver does his work. Each addition or deletion " @@ -7677,24 +7807,24 @@ msgstr "" "la sección en la que aparece el paquete." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:974 +#: apt.conf.5.xml:991 msgid "<literal>Debug::pkgInitConfig</literal>" msgstr "<literal>Debug::pkgInitConfig</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:977 +#: apt.conf.5.xml:994 msgid "Dump the default configuration to standard error on startup." msgstr "" "Vuelca la configuración predeterminada a la salida estándar durante al " "iniciarse." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:984 +#: apt.conf.5.xml:1001 msgid "<literal>Debug::pkgDPkgPM</literal>" msgstr "<literal>Debug::pkgDPkgPM</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:987 +#: apt.conf.5.xml:1004 msgid "" "When invoking &dpkg;, output the precise command line with which it is being " "invoked, with arguments separated by a single space character." @@ -7703,12 +7833,12 @@ msgstr "" "invocó, con los argumentos separados por un espacio." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:995 +#: apt.conf.5.xml:1012 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" msgstr "<literal>Debug::pkgDPkgProgressReporting</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:998 +#: apt.conf.5.xml:1015 msgid "" "Output all the data received from &dpkg; on the status file descriptor and " "any errors encountered while parsing it." @@ -7717,12 +7847,12 @@ msgstr "" "estado y cualquier error encontrado durante el análisis." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1005 +#: apt.conf.5.xml:1022 msgid "<literal>Debug::pkgOrderList</literal>" msgstr "<literal>Debug::pkgOrderList</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1009 +#: apt.conf.5.xml:1026 msgid "" "Generate a trace of the algorithm that decides the order in which " "<literal>apt</literal> should pass packages to &dpkg;." @@ -7731,12 +7861,12 @@ msgstr "" "literal> debería entregar los paquetes a &dpkg;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1017 +#: apt.conf.5.xml:1034 msgid "<literal>Debug::pkgPackageManager</literal>" msgstr "<literal>Debug::pkgPackageManager</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1021 +#: apt.conf.5.xml:1038 msgid "" "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "" @@ -7744,22 +7874,22 @@ msgstr "" "&dpkg;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1028 +#: apt.conf.5.xml:1045 msgid "<literal>Debug::pkgPolicy</literal>" msgstr "<literal>Debug::pkgPolicy</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1032 +#: apt.conf.5.xml:1049 msgid "Output the priority of each package list on startup." msgstr "Muestra la prioridad de cada lista de paquetes al iniciarse." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1038 +#: apt.conf.5.xml:1055 msgid "<literal>Debug::pkgProblemResolver</literal>" msgstr "<literal>Debug::pkgProblemResolver</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1042 +#: apt.conf.5.xml:1059 msgid "" "Trace the execution of the dependency resolver (this applies only to what " "happens when a complex dependency problem is encountered)." @@ -7768,12 +7898,12 @@ msgstr "" "lo que ocurre cuando se encuentra un problema de dependencias complejo)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1050 +#: apt.conf.5.xml:1067 msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>" msgstr "<literal>Debug::pkgProblemResolver::ShowScores</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1053 +#: apt.conf.5.xml:1070 msgid "" "Display a list of all installed packages with their calculated score used by " "the pkgProblemResolver. The description of the package is the same as " @@ -7784,12 +7914,12 @@ msgstr "" "misma que la descrita en <literal>Debug::pkgDepCache::Marker</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1061 +#: apt.conf.5.xml:1078 msgid "<literal>Debug::sourceList</literal>" msgstr "<literal>Debug::sourceList</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1065 +#: apt.conf.5.xml:1082 msgid "" "Print information about the vendors read from <filename>/etc/apt/vendors." "list</filename>." @@ -7798,7 +7928,7 @@ msgstr "" "vendors.list</filename>." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1088 +#: apt.conf.5.xml:1105 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." @@ -7807,13 +7937,13 @@ msgstr "" "valores de ejemplo para todas las opciones posibles." #. type: Content of: <refentry><refsect1><variablelist> -#: apt.conf.5.xml:1095 +#: apt.conf.5.xml:1112 msgid "&file-aptconf;" msgstr "&file-aptconf;" #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1100 +#: apt.conf.5.xml:1117 msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "&apt-cache;, &apt-config;, &apt-preferences;." @@ -9347,8 +9477,9 @@ msgstr "" #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml:81 -#, no-wrap -msgid "deb uri distribution [component1] [component2] [...]" +#, fuzzy, no-wrap +#| msgid "deb uri distribution [component1] [component2] [...]" +msgid "deb [ options ] uri distribution [component1] [component2] [...]" msgstr "deb uri distribución [componente1] [componente2] [...]" #. type: Content of: <refentry><refsect1><para> @@ -9419,6 +9550,27 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:112 msgid "" +"<literal>options</literal> is always optional and needs to be surounded by " +"square brackets. It can consist of multiple settings in the form " +"<literal><replaceable>setting</replaceable>=<replaceable>value</" +"replaceable></literal>. Multiple settings are separated by spaces. The " +"following settings are supported by APT, note though that unsupported " +"settings will be ignored silently:" +msgstr "" + +#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> +#: sources.list.5.xml:117 +msgid "" +"<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</" +"replaceable>,…</literal> can be used to specify for which architectures " +"packages information should be downloaded. If this option is not set all " +"architectures defined by the <literal>APT::Architectures</literal> option " +"will be downloaded." +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:123 +msgid "" "It is important to list sources in order of preference, with the most " "preferred source listed first. Typically this will result in sorting by " "speed from fastest to slowest (CD-ROM followed by hosts on a local network, " @@ -9430,12 +9582,12 @@ msgstr "" "seguidos por servidores de Internet distantes, por ejemplo)." #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:117 +#: sources.list.5.xml:128 msgid "Some examples:" msgstr "Algunos ejemplos:" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:119 +#: sources.list.5.xml:130 #, no-wrap msgid "" "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n" @@ -9447,17 +9599,17 @@ msgstr "" " " #. type: Content of: <refentry><refsect1><title> -#: sources.list.5.xml:125 +#: sources.list.5.xml:136 msgid "URI specification" msgstr "Especificación de la URI" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: sources.list.5.xml:130 +#: sources.list.5.xml:141 msgid "file" msgstr "file" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:132 +#: sources.list.5.xml:143 msgid "" "The file scheme allows an arbitrary directory in the file system to be " "considered an archive. This is useful for NFS mounts and local mirrors or " @@ -9468,7 +9620,7 @@ msgstr "" "particiones montadas mediante NFS y réplicas o archivos de paquetes locales." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:139 +#: sources.list.5.xml:150 msgid "" "The cdrom scheme allows APT to use a local CDROM drive with media swapping. " "Use the &apt-cdrom; program to create cdrom entries in the source list." @@ -9478,7 +9630,7 @@ msgstr "" "list»." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:146 +#: sources.list.5.xml:157 msgid "" "The http scheme specifies an HTTP server for the archive. If an environment " "variable <envar>http_proxy</envar> is set with the format http://server:" @@ -9495,7 +9647,7 @@ msgstr "" "Tenga en cuenta que este método de autenticación no es seguro." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:157 +#: sources.list.5.xml:168 msgid "" "The ftp scheme specifies an FTP server for the archive. APT's FTP behavior " "is highly configurable; for more information see the &apt-conf; manual page. " @@ -9514,12 +9666,12 @@ msgstr "" "ignorarán proxies ftp definidos en el fichero de configuración que usen http." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: sources.list.5.xml:166 +#: sources.list.5.xml:177 msgid "copy" msgstr "copy" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:168 +#: sources.list.5.xml:179 msgid "" "The copy scheme is identical to the file scheme except that packages are " "copied into the cache directory instead of used directly at their location. " @@ -9530,17 +9682,17 @@ msgstr "" "Esto es útil para gente que use discos zip con APT." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: sources.list.5.xml:173 +#: sources.list.5.xml:184 msgid "rsh" msgstr "rsh" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: sources.list.5.xml:173 +#: sources.list.5.xml:184 msgid "ssh" msgstr "ssh" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:175 +#: sources.list.5.xml:186 msgid "" "The rsh/ssh method invokes rsh/ssh to connect to a remote host as a given " "user and access the files. It is a good idea to do prior arrangements with " @@ -9555,12 +9707,12 @@ msgstr "" "command> y <command>dd</command> para realizar la transferencia de ficheros." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: sources.list.5.xml:183 +#: sources.list.5.xml:194 msgid "more recognizable URI types" msgstr "Otros tipos de URI reconocidos." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:185 +#: sources.list.5.xml:196 msgid "" "APT can be extended with more methods shipped in other optional packages " "which should follow the nameing scheme <literal>apt-transport-" @@ -9581,7 +9733,7 @@ msgstr "" "filename></refentrytitle> <manvolnum>1</manvolnum></citerefentry>." #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:127 +#: sources.list.5.xml:138 msgid "" "The currently recognized URI types are cdrom, file, http, ftp, copy, ssh, " "rsh. <placeholder type=\"variablelist\" id=\"0\"/>" @@ -9590,7 +9742,7 @@ msgstr "" "<placeholder type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:199 +#: sources.list.5.xml:210 msgid "" "Uses the archive stored locally (or NFS mounted) at /home/jason/debian for " "stable/main, stable/contrib, and stable/non-free." @@ -9599,36 +9751,59 @@ msgstr "" "«stable/main», «stable/contrib», y «stable/non-free»." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:201 +#: sources.list.5.xml:212 #, no-wrap msgid "deb file:/home/jason/debian stable main contrib non-free" msgstr "deb file:/home/jason/debian stable main contrib non-free" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:203 +#: sources.list.5.xml:214 msgid "As above, except this uses the unstable (development) distribution." msgstr "" "Como arriba, excepto que usa la distribución «unstable» (en desarrollo)." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:204 +#: sources.list.5.xml:215 #, no-wrap msgid "deb file:/home/jason/debian unstable main contrib non-free" msgstr "deb file:/home/jason/debian unstable main contrib non-free" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:206 +#: sources.list.5.xml:217 msgid "Source line for the above" msgstr "Línea para obtener el código fuente desde la ubicación anterior." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:207 +#: sources.list.5.xml:218 #, no-wrap msgid "deb-src file:/home/jason/debian unstable main contrib non-free" msgstr "deb-src file:/home/jason/debian unstable main contrib non-free" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:209 +#: sources.list.5.xml:220 +msgid "" +"The first line gets package information for the architectures in " +"<literal>APT::Architectures</literal> while the second always retrieves " +"<literal>amd64</literal> and <literal>armel</literal>." +msgstr "" + +#. type: Content of: <refentry><refsect1><literallayout> +#: sources.list.5.xml:222 +#, fuzzy, no-wrap +#| msgid "" +#| "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n" +#| "deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n" +#| " " +msgid "" +"deb http://ftp.debian.org/debian &stable-codename; main\n" +"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main" +msgstr "" +"deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n" +"deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n" +" " + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:225 msgid "" "Uses HTTP to access the archive at archive.debian.org, and uses only the " "hamm/main area." @@ -9637,13 +9812,13 @@ msgstr "" "sólo la sección «hamm/main»." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:211 +#: sources.list.5.xml:227 #, no-wrap msgid "deb http://archive.debian.org/debian-archive hamm main" msgstr "deb http://archive.debian.org/debian-archive hamm main" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:213 +#: sources.list.5.xml:229 msgid "" "Uses FTP to access the archive at ftp.debian.org, under the debian " "directory, and uses only the &stable-codename;/contrib area." @@ -9652,13 +9827,13 @@ msgstr "" "directorio «debian», y usa sólo la sección «&stable-codename;/contrib»." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:215 +#: sources.list.5.xml:231 #, no-wrap msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib" msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:217 +#: sources.list.5.xml:233 msgid "" "Uses FTP to access the archive at ftp.debian.org, under the debian " "directory, and uses only the unstable/contrib area. If this line appears as " @@ -9671,20 +9846,20 @@ msgstr "" "filename>, se usará sólo una sesión FTP para ambas." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:221 +#: sources.list.5.xml:237 #, no-wrap msgid "deb ftp://ftp.debian.org/debian unstable contrib" msgstr "deb ftp://ftp.debian.org/debian unstable contrib" #. type: Content of: <refentry><refsect1><para><literallayout> -#: sources.list.5.xml:230 +#: sources.list.5.xml:246 #, fuzzy, no-wrap #| msgid "deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/" msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/" msgstr "deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:223 +#: sources.list.5.xml:239 #, fuzzy #| msgid "" #| "Uses HTTP to access the archive at nonus.debian.org, under the debian-non-" @@ -9712,7 +9887,7 @@ msgstr "" "estructura.) <placeholder type=\"literallayout\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:235 +#: sources.list.5.xml:251 msgid "&apt-cache; &apt-conf;" msgstr "&apt-cache; &apt-conf;" @@ -11237,6 +11412,14 @@ msgstr " # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade" msgid "Which will use the already fetched archives on the disc." msgstr "Ésto usará los archivos del disco previamente obtenidos." +#~ msgid "" +#~ "Update the local keyring with the keyring of Debian archive keys and " +#~ "removes from the keyring the archive keys which are no longer valid." +#~ msgstr "" +#~ "Actualiza el registro de claves local con el registro de claves del " +#~ "archivo Debian, y elimina del registro las claves del archivo que ya no " +#~ "son válidas." + #~ msgid "<option>--md5</option>" #~ msgstr "<option>--md5</option>" diff --git a/doc/po/fr.po b/doc/po/fr.po index e00a87b0e..bed2c2985 100644 --- a/doc/po/fr.po +++ b/doc/po/fr.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2011-06-28 16:42+0200\n" +"POT-Creation-Date: 2011-11-20 17:58+0100\n" "PO-Revision-Date: 2011-02-17 07:50+0100\n" "Last-Translator: Christian Perrier <bubulle@debian.org>\n" "Language-Team: French <debian-l10n-french@lists.debian.org>\n" @@ -730,7 +730,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:64 apt-cdrom.8.xml:50 apt-config.8.xml:50 -#: apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:114 +#: apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:121 #: apt-key.8.xml:38 apt-mark.8.xml:56 apt-secure.8.xml:43 #: apt-sortpkgs.1.xml:47 apt.conf.5.xml:42 apt_preferences.5.xml:36 #: sources.list.5.xml:36 @@ -751,7 +751,7 @@ msgstr "" "desquelles il extrait les informations intéressantes." #. type: Content of: <refentry><refsect1><para> -#: apt-cache.8.xml:70 apt-get.8.xml:120 +#: apt-cache.8.xml:70 apt-get.8.xml:127 msgid "" "Unless the <option>-h</option>, or <option>--help</option> option is given, " "one of the commands below must be present." @@ -1250,8 +1250,8 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:278 apt-config.8.xml:96 apt-extracttemplates.1.xml:59 -#: apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:126 -#: apt-sortpkgs.1.xml:57 apt.conf.5.xml:560 apt.conf.5.xml:582 +#: apt-ftparchive.1.xml:525 apt-get.8.xml:342 apt-mark.8.xml:126 +#: apt-sortpkgs.1.xml:57 apt.conf.5.xml:577 apt.conf.5.xml:599 msgid "options" msgstr "options" @@ -1277,7 +1277,7 @@ msgstr "" "<literal>Dir::Cache::pkgcache</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:288 apt-ftparchive.1.xml:572 apt-get.8.xml:393 +#: apt-cache.8.xml:288 apt-ftparchive.1.xml:572 apt-get.8.xml:404 #: apt-sortpkgs.1.xml:61 msgid "<option>-s</option>" msgstr "<option>-s</option>" @@ -1304,12 +1304,12 @@ msgstr "" "<literal>Dir::Cache::srcpkgcache</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:383 +#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:394 msgid "<option>-q</option>" msgstr "<option>-q</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:383 +#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:394 msgid "<option>--quiet</option>" msgstr "<option>--quiet</option>" @@ -1412,7 +1412,7 @@ msgstr "" "replaceable></literal>, p. ex. <literal>APT::Cache::ShowRecommends</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:323 apt-cdrom.8.xml:124 apt-get.8.xml:350 +#: apt-cache.8.xml:323 apt-cdrom.8.xml:124 apt-get.8.xml:361 msgid "<option>-f</option>" msgstr "<option>-f</option>" @@ -1433,6 +1433,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:584 +#: apt-get.8.xml:447 msgid "<option>-a</option>" msgstr "<option>-a</option>" @@ -1552,14 +1553,14 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist> #: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101 -#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:612 apt-get.8.xml:570 +#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:612 apt-get.8.xml:591 #: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67 msgid "&apt-commonoptions;" msgstr "&apt-commonoptions;" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:172 apt-mark.8.xml:144 -#: apt.conf.5.xml:1093 apt_preferences.5.xml:697 +#: apt-cache.8.xml:372 apt-get.8.xml:596 apt-key.8.xml:175 apt-mark.8.xml:144 +#: apt.conf.5.xml:1110 apt_preferences.5.xml:697 msgid "Files" msgstr "Fichiers" @@ -1570,10 +1571,10 @@ msgstr "&file-sourceslist; &file-statelists;" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106 -#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:628 apt-get.8.xml:585 -#: apt-key.8.xml:193 apt-mark.8.xml:150 apt-secure.8.xml:185 -#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:704 -#: sources.list.5.xml:234 +#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:628 apt-get.8.xml:606 +#: apt-key.8.xml:196 apt-mark.8.xml:150 apt-secure.8.xml:185 +#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1116 apt_preferences.5.xml:704 +#: sources.list.5.xml:250 msgid "See Also" msgstr "Voir aussi" @@ -1584,7 +1585,7 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;." #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111 -#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:632 apt-get.8.xml:591 +#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:632 apt-get.8.xml:612 #: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76 msgid "Diagnostics" msgstr "Diagnostics" @@ -1714,12 +1715,12 @@ msgstr "" "\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><title> -#: apt-cdrom.8.xml:94 apt-key.8.xml:158 +#: apt-cdrom.8.xml:94 apt-key.8.xml:161 msgid "Options" msgstr "Options" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:540 apt-get.8.xml:345 +#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:540 apt-get.8.xml:356 msgid "<option>-d</option>" msgstr "<option>-d</option>" @@ -1763,7 +1764,7 @@ msgstr "" "<literal>APT::CDROM::Rename</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cdrom.8.xml:116 apt-get.8.xml:364 +#: apt-cdrom.8.xml:116 apt-get.8.xml:375 msgid "<option>-m</option>" msgstr "<option>-m</option>" @@ -1820,17 +1821,17 @@ msgstr "" "le CD mais tous les paquets seront repérés." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cdrom.8.xml:143 apt-get.8.xml:395 +#: apt-cdrom.8.xml:143 apt-get.8.xml:406 msgid "<option>--just-print</option>" msgstr "<option>--just-print</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cdrom.8.xml:144 apt-get.8.xml:397 +#: apt-cdrom.8.xml:144 apt-get.8.xml:408 msgid "<option>--recon</option>" msgstr "<option>--recon</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cdrom.8.xml:145 apt-get.8.xml:398 +#: apt-cdrom.8.xml:145 apt-get.8.xml:409 msgid "<option>--no-act</option>" msgstr "<option>--no-act</option>" @@ -2055,7 +2056,7 @@ msgstr "" "<filename>package.config.XXXX</filename>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-extracttemplates.1.xml:63 apt-get.8.xml:504 +#: apt-extracttemplates.1.xml:63 apt-get.8.xml:525 msgid "<option>-t</option>" msgstr "<option>-t</option>" @@ -2341,7 +2342,7 @@ msgstr "" "préciser index et répertoires aussi bien que les paramètres requis." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:145 apt-get.8.xml:287 +#: apt-ftparchive.1.xml:145 apt-get.8.xml:298 msgid "clean" msgstr "clean" @@ -2905,8 +2906,8 @@ msgstr "" "distribution ; classiquement, on trouve <literal>main contrib non-free</" "literal>." -#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:394 +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:394 apt.conf.5.xml:157 msgid "Architectures" msgstr "Architectures" @@ -3314,8 +3315,8 @@ msgstr "" "generate." #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:617 apt.conf.5.xml:1087 apt_preferences.5.xml:544 -#: sources.list.5.xml:198 +#: apt-ftparchive.1.xml:617 apt.conf.5.xml:1104 apt_preferences.5.xml:544 +#: sources.list.5.xml:209 msgid "Examples" msgstr "Exemples" @@ -3366,15 +3367,45 @@ msgstr "" #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> #: apt-get.8.xml:39 +#, fuzzy +#| msgid "" +#| "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> " +#| "<option>-o= <replaceable>config_string</replaceable> </option> </arg> " +#| "<arg> <option>-c= <replaceable>config_file</replaceable> </option> </arg> " +#| "<arg> <option>-t=</option> <arg choice='plain'> " +#| "<replaceable>target_release</replaceable> </arg> </arg> <group choice=" +#| "\"req\"> <arg choice='plain'>update</arg> <arg choice='plain'>upgrade</" +#| "arg> <arg choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-" +#| "upgrade</arg> <arg choice='plain'>install <arg choice=\"plain\" rep=" +#| "\"repeat\"><replaceable>pkg</replaceable> <arg> <group choice='req'> <arg " +#| "choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> " +#| "<arg choice='plain'> /<replaceable>target_release</replaceable> </arg> </" +#| "group> </arg> </arg> </arg> <arg choice='plain'>remove <arg choice=\"plain" +#| "\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg " +#| "choice='plain'>purge <arg choice=\"plain\" rep=\"repeat" +#| "\"><replaceable>pkg</replaceable></arg></arg> <arg choice='plain'>source " +#| "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> <arg> " +#| "<group choice='req'> <arg choice='plain'> " +#| "=<replaceable>pkg_version_number</replaceable> </arg> <arg " +#| "choice='plain'> /<replaceable>target_release</replaceable> </arg> </" +#| "group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice=" +#| "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg " +#| "choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg " +#| "choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg " +#| "choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg " +#| "choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> " +#| "<group choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--" +#| "help</arg> </group> </arg> </group>" msgid "" "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> " "<option>-o= <replaceable>config_string</replaceable> </option> </arg> <arg> " "<option>-c= <replaceable>config_file</replaceable> </option> </arg> <arg> " "<option>-t=</option> <arg choice='plain'> <replaceable>target_release</" -"replaceable> </arg> </arg> <group choice=\"req\"> <arg " -"choice='plain'>update</arg> <arg choice='plain'>upgrade</arg> <arg " -"choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-upgrade</arg> " -"<arg choice='plain'>install <arg choice=\"plain\" rep=\"repeat" +"replaceable> </arg> </arg> <arg> <option>-a=</option> <arg choice='plain'> " +"<replaceable>default_architecture</replaceable> </arg> </arg> <group choice=" +"\"req\"> <arg choice='plain'>update</arg> <arg choice='plain'>upgrade</arg> " +"<arg choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-upgrade</" +"arg> <arg choice='plain'>install <arg choice=\"plain\" rep=\"repeat" "\"><replaceable>pkg</replaceable> <arg> <group choice='req'> <arg " "choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> <arg " "choice='plain'> /<replaceable>target_release</replaceable> </arg> </group> </" @@ -3423,7 +3454,7 @@ msgstr "" "</group> </arg> </group>" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:115 +#: apt-get.8.xml:122 msgid "" "<command>apt-get</command> is the command-line tool for handling packages, " "and may be considered the user's \"back-end\" to other tools using the APT " @@ -3436,12 +3467,12 @@ msgstr "" "existent, comme &dselect;, &aptitude;, &synaptic; and &wajig;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:124 apt-key.8.xml:127 +#: apt-get.8.xml:131 apt-key.8.xml:127 msgid "update" msgstr "update" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:125 +#: apt-get.8.xml:132 msgid "" "<literal>update</literal> is used to resynchronize the package index files " "from their sources. The indexes of available packages are fetched from the " @@ -3466,12 +3497,12 @@ msgstr "" "ne peut être connue à l'avance." #. type: <tag></tag> -#: apt-get.8.xml:136 guide.sgml:121 +#: apt-get.8.xml:143 guide.sgml:121 msgid "upgrade" msgstr "upgrade" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:137 +#: apt-get.8.xml:144 msgid "" "<literal>upgrade</literal> is used to install the newest versions of all " "packages currently installed on the system from the sources enumerated in " @@ -3497,12 +3528,12 @@ msgstr "" "l'existence de nouvelles versions des paquets." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:149 +#: apt-get.8.xml:156 msgid "dselect-upgrade" msgstr "dselect-upgrade" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:150 +#: apt-get.8.xml:157 msgid "" "<literal>dselect-upgrade</literal> is used in conjunction with the " "traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</" @@ -3520,12 +3551,12 @@ msgstr "" "installation de nouveaux paquets)." #. type: <tag></tag> -#: apt-get.8.xml:159 guide.sgml:140 +#: apt-get.8.xml:166 guide.sgml:140 msgid "dist-upgrade" msgstr "dist-upgrade" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:160 +#: apt-get.8.xml:167 msgid "" "<literal>dist-upgrade</literal> in addition to performing the function of " "<literal>upgrade</literal>, also intelligently handles changing dependencies " @@ -3548,12 +3579,12 @@ msgstr "" "un mécanisme de remplacement des paramètres généraux pour certains paquets." #. type: <tag></tag> -#: apt-get.8.xml:172 guide.sgml:131 +#: apt-get.8.xml:179 guide.sgml:131 msgid "install" msgstr "install" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:174 +#: apt-get.8.xml:181 msgid "" "<literal>install</literal> is followed by one or more packages desired for " "installation or upgrading. Each package is a package name, not a fully " @@ -3581,7 +3612,7 @@ msgstr "" "des conflits d'apt-get." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:192 +#: apt-get.8.xml:199 msgid "" "A specific version of a package can be selected for installation by " "following the package name with an equals and the version of the package to " @@ -3598,7 +3629,7 @@ msgstr "" "unstable)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:199 +#: apt-get.8.xml:206 msgid "" "Both of the version selection mechanisms can downgrade packages and must be " "used with care." @@ -3608,7 +3639,7 @@ msgstr "" "avec précaution." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:202 +#: apt-get.8.xml:209 msgid "" "This is also the target to use if you want to upgrade one or more already-" "installed packages without upgrading every package you have on your system. " @@ -3628,7 +3659,7 @@ msgstr "" "décrit plus haut) sera récupérée et installée." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:213 +#: apt-get.8.xml:220 msgid "" "Finally, the &apt-preferences; mechanism allows you to create an alternative " "installation policy for individual packages." @@ -3637,7 +3668,7 @@ msgstr "" "l'installation des paquets." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:217 +#: apt-get.8.xml:224 msgid "" "If no package matches the given expression and the expression contains one " "of '.', '?' or '*' then it is assumed to be a POSIX regular expression, and " @@ -3658,12 +3689,12 @@ msgstr "" "d'utiliser une expression plus précise." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:226 +#: apt-get.8.xml:233 msgid "remove" msgstr "remove" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:227 +#: apt-get.8.xml:234 msgid "" "<literal>remove</literal> is identical to <literal>install</literal> except " "that packages are removed instead of installed. Note the removing a package " @@ -3679,12 +3710,12 @@ msgstr "" "d'être supprimé." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:234 +#: apt-get.8.xml:241 msgid "purge" msgstr "purge" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:235 +#: apt-get.8.xml:242 msgid "" "<literal>purge</literal> is identical to <literal>remove</literal> except " "that packages are removed and purged (any configuration files are deleted " @@ -3695,12 +3726,12 @@ msgstr "" "de configuration sont également effacés)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:239 +#: apt-get.8.xml:246 msgid "source" msgstr "source" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:240 +#: apt-get.8.xml:247 msgid "" "<literal>source</literal> causes <command>apt-get</command> to fetch source " "packages. APT will examine the available packages to decide which source " @@ -3720,7 +3751,7 @@ msgstr "" "respect the default release\"\"\" me paraît douteux." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:248 +#: apt-get.8.xml:255 msgid "" "Source packages are tracked separately from binary packages via <literal>deb-" "src</literal> type lines in the &sources-list; file. This means that you " @@ -3736,19 +3767,26 @@ msgstr "" "installé ou que vous voulez installer." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:255 +#: apt-get.8.xml:262 +#, fuzzy +#| msgid "" +#| "If the <option>--compile</option> option is specified then the package " +#| "will be compiled to a binary .deb using <command>dpkg-buildpackage</" +#| "command>, if <option>--download-only</option> is specified then the " +#| "source package will not be unpacked." msgid "" "If the <option>--compile</option> option is specified then the package will " -"be compiled to a binary .deb using <command>dpkg-buildpackage</command>, if " -"<option>--download-only</option> is specified then the source package will " -"not be unpacked." +"be compiled to a binary .deb using <command>dpkg-buildpackage</command> for " +"the architecture as defined by the <command>--host-architecture</command> " +"option. If <option>--download-only</option> is specified then the source " +"package will not be unpacked." msgstr "" "Si l'option <option>--compile</option> est spécifiée, le paquet est compilé " "en un binaire .deb avec <command>dpkg-buildpackage</command>. Si <option>--" "download-only</option> est spécifié, le source n'est pas décompacté." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:260 +#: apt-get.8.xml:269 msgid "" "A specific source version can be retrieved by postfixing the source name " "with an equals and then the version to fetch, similar to the mechanism used " @@ -3763,7 +3801,7 @@ msgstr "" "Source</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:266 +#: apt-get.8.xml:275 msgid "" "Note that source packages are not tracked like binary packages, they exist " "only in the current directory and are similar to downloading source tar " @@ -3774,27 +3812,34 @@ msgstr "" "sont semblables à des sources téléchargées sous forme d'archives tar." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:271 +#: apt-get.8.xml:280 msgid "build-dep" msgstr "build-dep" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:272 +#: apt-get.8.xml:281 +#, fuzzy +#| msgid "" +#| "<literal>build-dep</literal> causes apt-get to install/remove packages in " +#| "an attempt to satisfy the build dependencies for a source package." msgid "" "<literal>build-dep</literal> causes apt-get to install/remove packages in an " -"attempt to satisfy the build dependencies for a source package." +"attempt to satisfy the build dependencies for a source package. By default " +"the dependencies are satisfied to build the package natively. If desired a " +"host-architecture can be specified with the <option>--host-architecture</" +"option> option instead." msgstr "" "Avec la commande <literal>build-dep</literal>, apt-get installe ou supprime " "des paquets dans le but de satisfaire les dépendances de construction d'un " "paquet source." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:276 +#: apt-get.8.xml:287 msgid "check" msgstr "check" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:277 +#: apt-get.8.xml:288 msgid "" "<literal>check</literal> is a diagnostic tool; it updates the package cache " "and checks for broken dependencies." @@ -3803,12 +3848,12 @@ msgstr "" "jour le cache des paquets et cherche les dépendances défectueuses." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:281 +#: apt-get.8.xml:292 msgid "download" msgstr "download" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:282 +#: apt-get.8.xml:293 msgid "" "<literal>download</literal> will download the given binary package into the " "current directory." @@ -3817,7 +3862,7 @@ msgstr "" "répertoire courant." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:288 +#: apt-get.8.xml:299 msgid "" "<literal>clean</literal> clears out the local repository of retrieved " "package files. It removes everything but the lock file from " @@ -3836,12 +3881,12 @@ msgstr "" "temps en temps si l'on veut libérer de l'espace disque." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:297 +#: apt-get.8.xml:308 msgid "autoclean" msgstr "autoclean" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:298 +#: apt-get.8.xml:309 msgid "" "Like <literal>clean</literal>, <literal>autoclean</literal> clears out the " "local repository of retrieved package files. The difference is that it only " @@ -3860,28 +3905,33 @@ msgstr "" "installés." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:307 +#: apt-get.8.xml:318 msgid "autoremove" msgstr "autoremove" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:308 +#: apt-get.8.xml:319 +#, fuzzy +#| msgid "" +#| "<literal>autoremove</literal> is used to remove packages that were " +#| "automatically installed to satisfy dependencies for some package and that " +#| "are no more needed." msgid "" "<literal>autoremove</literal> is used to remove packages that were " -"automatically installed to satisfy dependencies for some package and that " -"are no more needed." +"automatically installed to satisfy dependencies for other packages and are " +"now no longer needed." msgstr "" "Avec la commande <literal>autoremove</literal>, apt-get supprime les paquets " "installés dans le but de satisfaire les dépendances d'un paquet donné et qui " "ne sont plus nécessaires." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:312 +#: apt-get.8.xml:323 msgid "changelog" msgstr "changelog" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:313 +#: apt-get.8.xml:324 msgid "" "<literal>changelog</literal> downloads a package changelog and displays it " "through <command>sensible-pager</command>. The server name and base " @@ -3903,12 +3953,12 @@ msgstr "" "<option>install</option>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:335 +#: apt-get.8.xml:346 msgid "<option>--no-install-recommends</option>" msgstr "<option>--no-install-recommends</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:336 +#: apt-get.8.xml:347 msgid "" "Do not consider recommended packages as a dependency for installing. " "Configuration Item: <literal>APT::Install-Recommends</literal>." @@ -3917,12 +3967,12 @@ msgstr "" "Élément de configuration : <literal>APT::Install-Recommends</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:340 +#: apt-get.8.xml:351 msgid "<option>--install-suggests</option>" msgstr "<option>--install-suggests</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:341 +#: apt-get.8.xml:352 msgid "" "Consider suggested packages as a dependency for installing. Configuration " "Item: <literal>APT::Install-Suggests</literal>." @@ -3931,12 +3981,12 @@ msgstr "" "de configuration : <literal>APT::Install-Suggests</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:345 +#: apt-get.8.xml:356 msgid "<option>--download-only</option>" msgstr "<option>--download-only</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:346 +#: apt-get.8.xml:357 msgid "" "Download only; package files are only retrieved, not unpacked or installed. " "Configuration Item: <literal>APT::Get::Download-Only</literal>." @@ -3946,12 +3996,12 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:350 +#: apt-get.8.xml:361 msgid "<option>--fix-broken</option>" msgstr "<option>--fix-broken</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:351 +#: apt-get.8.xml:362 msgid "" "Fix; attempt to correct a system with broken dependencies in place. This " "option, when used with install/remove, can omit any packages to permit APT " @@ -3979,17 +4029,17 @@ msgstr "" "configuration : <literal>APT::Get::Fix-Broken</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:364 +#: apt-get.8.xml:375 msgid "<option>--ignore-missing</option>" msgstr "<option>--ignore-missing</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:365 +#: apt-get.8.xml:376 msgid "<option>--fix-missing</option>" msgstr "<option>--fix-missing</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:366 +#: apt-get.8.xml:377 msgid "" "Ignore missing packages; If packages cannot be retrieved or fail the " "integrity check after retrieval (corrupted package files), hold back those " @@ -4009,12 +4059,12 @@ msgstr "" "<literal>APT::Get::Fix-Missing</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:376 +#: apt-get.8.xml:387 msgid "<option>--no-download</option>" msgstr "<option>--no-download</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:377 +#: apt-get.8.xml:388 msgid "" "Disables downloading of packages. This is best used with <option>--ignore-" "missing</option> to force APT to use only the .debs it has already " @@ -4026,7 +4076,7 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:384 +#: apt-get.8.xml:395 msgid "" "Quiet; produces output suitable for logging, omitting progress indicators. " "More q's will produce more quiet up to a maximum of 2. You can also use " @@ -4048,17 +4098,17 @@ msgstr "" "configuration : <literal>quiet</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:394 +#: apt-get.8.xml:405 msgid "<option>--simulate</option>" msgstr "<option>--simulate</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:396 +#: apt-get.8.xml:407 msgid "<option>--dry-run</option>" msgstr "<option>--dry-run</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:399 +#: apt-get.8.xml:410 msgid "" "No action; perform a simulation of events that would occur but do not " "actually change the system. Configuration Item: <literal>APT::Get::" @@ -4069,7 +4119,7 @@ msgstr "" "<literal>APT::Get::Simulate</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:403 +#: apt-get.8.xml:414 msgid "" "Simulation run as user will deactivate locking (<literal>Debug::NoLocking</" "literal>) automatic. Also a notice will be displayed indicating that this " @@ -4088,7 +4138,7 @@ msgstr "" "utile qu'<literal>apt-get</literal> envoie de telles notifications)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:409 +#: apt-get.8.xml:420 msgid "" "Simulate prints out a series of lines each one representing a dpkg " "operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square brackets " @@ -4101,22 +4151,22 @@ msgstr "" "que les dommages n'ont aucune conséquence (rare)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:416 +#: apt-get.8.xml:427 msgid "<option>-y</option>" msgstr "<option>-y</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:416 +#: apt-get.8.xml:427 msgid "<option>--yes</option>" msgstr "<option>--yes</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:417 +#: apt-get.8.xml:428 msgid "<option>--assume-yes</option>" msgstr "<option>--assume-yes</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:418 +#: apt-get.8.xml:429 msgid "" "Automatic yes to prompts; assume \"yes\" as answer to all prompts and run " "non-interactively. If an undesirable situation, such as changing a held " @@ -4132,17 +4182,17 @@ msgstr "" "configuration : <literal>APT::Get::Assume-Yes</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:425 +#: apt-get.8.xml:436 msgid "<option>-u</option>" msgstr "<option>-u</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:425 +#: apt-get.8.xml:436 msgid "<option>--show-upgraded</option>" msgstr "<option>--show-upgraded</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:426 +#: apt-get.8.xml:437 msgid "" "Show upgraded packages; Print out a list of all packages that are to be " "upgraded. Configuration Item: <literal>APT::Get::Show-Upgraded</literal>." @@ -4152,17 +4202,17 @@ msgstr "" "Upgraded</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:431 +#: apt-get.8.xml:442 msgid "<option>-V</option>" msgstr "<option>-V</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:431 +#: apt-get.8.xml:442 msgid "<option>--verbose-versions</option>" msgstr "<option>--verbose-versions</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:432 +#: apt-get.8.xml:443 msgid "" "Show full versions for upgraded and installed packages. Configuration Item: " "<literal>APT::Get::Show-Versions</literal>." @@ -4171,22 +4221,40 @@ msgstr "" "Élément de configuration : <literal>APT::Get::Show-Versions</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:436 +#: apt-get.8.xml:448 +#, fuzzy +#| msgid "<option>--recurse</option>" +msgid "<option>--host-architecture</option>" +msgstr "<option>--recurse</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:449 +msgid "" +"This option controls the architecture packages are built for by <command>apt-" +"get source --compile</command> and how cross-builddependencies are " +"satisfied. By default is it not set which means that the host architecture " +"is the same as the build architecture (which is defined by <literal>APT::" +"Architecture</literal>). Configuration Item: <literal>APT::Get::Host-" +"Architecture</literal>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:457 msgid "<option>-b</option>" msgstr "<option>-b</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:436 +#: apt-get.8.xml:457 msgid "<option>--compile</option>" msgstr "<option>--compile</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:437 +#: apt-get.8.xml:458 msgid "<option>--build</option>" msgstr "<option>--build</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:438 +#: apt-get.8.xml:459 msgid "" "Compile source packages after downloading them. Configuration Item: " "<literal>APT::Get::Compile</literal>." @@ -4195,12 +4263,12 @@ msgstr "" "configuration : <literal>APT::Get::Compile</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:442 +#: apt-get.8.xml:463 msgid "<option>--ignore-hold</option>" msgstr "<option>--ignore-hold</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:443 +#: apt-get.8.xml:464 msgid "" "Ignore package Holds; This causes <command>apt-get</command> to ignore a " "hold placed on a package. This may be useful in conjunction with " @@ -4214,12 +4282,12 @@ msgstr "" "<literal>APT::Ignore-Hold</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:449 +#: apt-get.8.xml:470 msgid "<option>--no-upgrade</option>" msgstr "<option>--no-upgrade</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:450 +#: apt-get.8.xml:471 msgid "" "Do not upgrade packages; When used in conjunction with <literal>install</" "literal>, <literal>no-upgrade</literal> will prevent packages on the command " @@ -4232,12 +4300,12 @@ msgstr "" "Upgrade</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:456 +#: apt-get.8.xml:477 msgid "<option>--only-upgrade</option>" msgstr "<option>--only-upgrade</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:457 +#: apt-get.8.xml:478 msgid "" "Do not install new packages; When used in conjunction with <literal>install</" "literal>, <literal>only-upgrade</literal> will prevent packages on the " @@ -4251,12 +4319,12 @@ msgstr "" "Upgrade</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:463 +#: apt-get.8.xml:484 msgid "<option>--force-yes</option>" msgstr "<option>--force-yes</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:464 +#: apt-get.8.xml:485 msgid "" "Force yes; This is a dangerous option that will cause apt to continue " "without prompting if it is doing something potentially harmful. It should " @@ -4272,12 +4340,12 @@ msgstr "" "yes</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:471 +#: apt-get.8.xml:492 msgid "<option>--print-uris</option>" msgstr "<option>--print-uris</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:472 +#: apt-get.8.xml:493 msgid "" "Instead of fetching the files to install their URIs are printed. Each URI " "will have the path, the destination file name, the size and the expected md5 " @@ -4299,12 +4367,12 @@ msgstr "" "<literal>APT::Get::Print-URIs</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:482 +#: apt-get.8.xml:503 msgid "<option>--purge</option>" msgstr "<option>--purge</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:483 +#: apt-get.8.xml:504 msgid "" "Use purge instead of remove for anything that would be removed. An asterisk " "(\"*\") will be displayed next to packages which are scheduled to be purged. " @@ -4318,12 +4386,12 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:490 +#: apt-get.8.xml:511 msgid "<option>--reinstall</option>" msgstr "<option>--reinstall</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:491 +#: apt-get.8.xml:512 msgid "" "Re-Install packages that are already installed and at the newest version. " "Configuration Item: <literal>APT::Get::ReInstall</literal>." @@ -4332,12 +4400,12 @@ msgstr "" "Élément de configuration : <literal>APT::Get::ReInstall</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:495 +#: apt-get.8.xml:516 msgid "<option>--list-cleanup</option>" msgstr "<option>--list-cleanup</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:496 +#: apt-get.8.xml:517 msgid "" "This option defaults to on, use <literal>--no-list-cleanup</literal> to turn " "it off. When on <command>apt-get</command> will automatically manage the " @@ -4355,17 +4423,17 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:505 +#: apt-get.8.xml:526 msgid "<option>--target-release</option>" msgstr "<option>--target-release</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:506 +#: apt-get.8.xml:527 msgid "<option>--default-release</option>" msgstr "<option>--default-release</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:507 +#: apt-get.8.xml:528 msgid "" "This option controls the default input to the policy engine, it creates a " "default pin at priority 990 using the specified release string. This " @@ -4387,12 +4455,12 @@ msgstr "" "Release</literal>. Voyez aussi la page de manuel d'&apt-preferences;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:520 +#: apt-get.8.xml:541 msgid "<option>--trivial-only</option>" msgstr "<option>--trivial-only</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:522 +#: apt-get.8.xml:543 msgid "" "Only perform operations that are 'trivial'. Logically this can be considered " "related to <option>--assume-yes</option>, where <option>--assume-yes</" @@ -4406,12 +4474,12 @@ msgstr "" "Get::Trivial-Only</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:528 +#: apt-get.8.xml:549 msgid "<option>--no-remove</option>" msgstr "<option>--no-remove</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:529 +#: apt-get.8.xml:550 msgid "" "If any packages are to be removed apt-get immediately aborts without " "prompting. Configuration Item: <literal>APT::Get::Remove</literal>." @@ -4421,12 +4489,12 @@ msgstr "" "Remove</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:534 +#: apt-get.8.xml:555 msgid "<option>--auto-remove</option>" msgstr "<option>--auto-remove</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:535 +#: apt-get.8.xml:556 msgid "" "If the command is either <literal>install</literal> or <literal>remove</" "literal>, then this option acts like running <literal>autoremove</literal> " @@ -4439,12 +4507,12 @@ msgstr "" "inutilisés. Élément de configuration : <literal>APT::Get::Upgrade</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:541 +#: apt-get.8.xml:562 msgid "<option>--only-source</option>" msgstr "<option>--only-source</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:542 +#: apt-get.8.xml:563 msgid "" "Only has meaning for the <literal>source</literal> and <literal>build-dep</" "literal> commands. Indicates that the given source names are not to be " @@ -4464,22 +4532,22 @@ msgstr "" "literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:552 +#: apt-get.8.xml:573 msgid "<option>--diff-only</option>" msgstr "<option>--diff-only</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:552 +#: apt-get.8.xml:573 msgid "<option>--dsc-only</option>" msgstr "<option>--dsc-only</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:552 +#: apt-get.8.xml:573 msgid "<option>--tar-only</option>" msgstr "<option>--tar-only</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:553 +#: apt-get.8.xml:574 msgid "" "Download only the diff, dsc, or tar file of a source archive. Configuration " "Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</" @@ -4491,12 +4559,12 @@ msgstr "" "literal>, " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:558 +#: apt-get.8.xml:579 msgid "<option>--arch-only</option>" msgstr "<option>--arch-only</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:559 +#: apt-get.8.xml:580 msgid "" "Only process architecture-dependent build-dependencies. Configuration Item: " "<literal>APT::Get::Arch-Only</literal>." @@ -4506,12 +4574,12 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:563 +#: apt-get.8.xml:584 msgid "<option>--allow-unauthenticated</option>" msgstr "<option>--allow-unauthenticated</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:564 +#: apt-get.8.xml:585 msgid "" "Ignore if packages can't be authenticated and don't prompt about it. This " "is useful for tools like pbuilder. Configuration Item: <literal>APT::Get::" @@ -4523,7 +4591,7 @@ msgstr "" "AllowUnauthenticated</literal>." #. type: Content of: <refentry><refsect1><variablelist> -#: apt-get.8.xml:577 +#: apt-get.8.xml:598 msgid "" "&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; " "&file-statelists;" @@ -4532,7 +4600,7 @@ msgstr "" "&file-statelists;" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:586 +#: apt-get.8.xml:607 msgid "" "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, " "&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-" @@ -4543,7 +4611,7 @@ msgstr "" "« HOWTO » d'APT." #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:592 +#: apt-get.8.xml:613 msgid "" "<command>apt-get</command> returns zero on normal operation, decimal 100 on " "error." @@ -4552,22 +4620,22 @@ msgstr "" "décimal 100 en cas d'erreur." #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:595 +#: apt-get.8.xml:616 msgid "ORIGINAL AUTHORS" msgstr "AUTEURS D'ORIGINE" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:596 +#: apt-get.8.xml:617 msgid "&apt-author.jgunthorpe;" msgstr "&apt-author.jgunthorpe;" #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:599 +#: apt-get.8.xml:620 msgid "CURRENT AUTHORS" msgstr "AUTEURS ACTUELS" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:601 +#: apt-get.8.xml:622 msgid "&apt-author.team;" msgstr "&apt-author.team;" @@ -4692,30 +4760,33 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:131 msgid "" -"Update the local keyring with the keyring of Debian archive keys and removes " -"from the keyring the archive keys which are no longer valid." +"Update the local keyring with the archive keyring and remove from the local " +"keyring the archive keys which are no longer valid. The archive keyring is " +"shipped in the <literal>archive-keyring</literal> package of your " +"distribution, e.g. the <literal>debian-archive-keyring</literal> package in " +"Debian." msgstr "" -"Mettre à jour le trousseau de clés local avec le trousseau de clés de " -"l'archive Debian et supprimer les clés qui y sont périmées." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:140 +#: apt-key.8.xml:141 #, fuzzy #| msgid "update" msgid "net-update" msgstr "update" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:144 +#: apt-key.8.xml:145 msgid "" -"Update the local keyring with the keys of a key server and removes from the " -"keyring the archive keys which are no longer valid. This requires an " -"installed wget and an APT build configured to have a server to fetch from. " -"APT in Debian does not support this command, but Ubuntu's APT does." +"Work similar to the <command>update</command> command above, but get the " +"archive keyring from an URI instead and validate it against a master key. " +"This requires an installed &wget; and an APT build configured to have a " +"server to fetch from and a master keyring to validate. APT in Debian does " +"not support this command and relies on <command>update</command> instead, " +"but Ubuntu's APT does." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-key.8.xml:159 +#: apt-key.8.xml:162 msgid "" "Note that options need to be defined before the commands described in the " "previous section." @@ -4724,17 +4795,17 @@ msgstr "" "décrites dans la section suivante." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:161 +#: apt-key.8.xml:164 msgid "--keyring <replaceable>filename</replaceable>" msgstr "--keyring <replaceable>fichier</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:162 +#: apt-key.8.xml:165 msgid "" "With this option it is possible to specify a specific keyring file the " "command should operate on. The default is that a command is executed on the " "<filename>trusted.gpg</filename> file as well as on all parts in the " -"<filename>trusted.gpg.d</filename> directory, through <filename>trusted.gpg</" +"<filename>trusted.gpg.d</filename> directory, though <filename>trusted.gpg</" "filename> is the primary keyring which means that e.g. new keys are added to " "this one." msgstr "" @@ -4746,44 +4817,44 @@ msgstr "" "les nouvelles clés y seront ajoutées." #. type: Content of: <refentry><refsect1><variablelist> -#: apt-key.8.xml:175 +#: apt-key.8.xml:178 msgid "&file-trustedgpg;" msgstr "&file-trustedgpg;" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:177 +#: apt-key.8.xml:180 msgid "<filename>/etc/apt/trustdb.gpg</filename>" msgstr "<filename>/etc/apt/trustdb.gpg</filename>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:178 +#: apt-key.8.xml:181 msgid "Local trust database of archive keys." msgstr "Base de données locale de fiabilité des clés de l'archive." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:181 +#: apt-key.8.xml:184 msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:182 +#: apt-key.8.xml:185 msgid "Keyring of Debian archive trusted keys." msgstr "Trousseau des clés fiables de l'archive Debian." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:185 +#: apt-key.8.xml:188 msgid "" "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" msgstr "" "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:186 +#: apt-key.8.xml:189 msgid "Keyring of Debian archive removed trusted keys." msgstr "Trousseau des clés fiables supprimées de l'archive Debian." #. type: Content of: <refentry><refsect1><para> -#: apt-key.8.xml:195 +#: apt-key.8.xml:198 msgid "&apt-get;, &apt-secure;" msgstr "&apt-get;, &apt-secure;" @@ -5767,13 +5838,24 @@ msgstr "" "utiliser pour récupérer des fichiers et analyser des listes de paquets. La " "valeur interne par défaut est l'architecture pour laquelle APT a été compilé." +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:158 +msgid "" +"All Architectures the system supports. Processors implementing the " +"<literal>amd64</literal> are e.g. also able to execute binaries compiled for " +"<literal>i386</literal>; This list is use when fetching files and parsing " +"package lists. The internal default is always the native architecture " +"(<literal>APT::Architecture</literal>) and all foreign architectures it can " +"retrieve by calling <command>dpkg --print-foreign-architectures</command>." +msgstr "" + #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:157 +#: apt.conf.5.xml:165 msgid "Default-Release" msgstr "Default-Release" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:158 +#: apt.conf.5.xml:166 msgid "" "Default release to install packages from if more than one version available. " "Contains release name, codename or release version. Examples: 'stable', " @@ -5787,12 +5869,12 @@ msgstr "" "&apt-preferences;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:163 +#: apt.conf.5.xml:171 msgid "Ignore-Hold" msgstr "Ignore-Hold" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:164 +#: apt.conf.5.xml:172 msgid "" "Ignore Held packages; This global option causes the problem resolver to " "ignore held packages in its decision making." @@ -5802,12 +5884,12 @@ msgstr "" "décision." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:168 +#: apt.conf.5.xml:176 msgid "Clean-Installed" msgstr "Clean-Installed" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:169 +#: apt.conf.5.xml:177 msgid "" "Defaults to on. When turned on the autoclean feature will remove any " "packages which can no longer be downloaded from the cache. If turned off " @@ -5821,12 +5903,12 @@ msgstr "" "direct pour les réinstaller." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:175 +#: apt.conf.5.xml:183 msgid "Immediate-Configure" msgstr "Immediate-Configure" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:176 +#: apt.conf.5.xml:184 msgid "" "Defaults to on which will cause APT to install essential and important " "packages as fast as possible in the install/upgrade operation. This is done " @@ -5890,12 +5972,12 @@ msgstr "" "utilisée afin qu'il soit étudié et corrigé." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:198 +#: apt.conf.5.xml:206 msgid "Force-LoopBreak" msgstr "Force-LoopBreak" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:199 +#: apt.conf.5.xml:207 msgid "" "Never Enable this option unless you -really- know what you are doing. It " "permits APT to temporarily remove an essential package to break a Conflicts/" @@ -5913,12 +5995,12 @@ msgstr "" "les paquets dont ces paquets dépendent." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:207 +#: apt.conf.5.xml:215 msgid "Cache-Start, Cache-Grow and Cache-Limit" msgstr "Cache-Start, Cache-Grow et Cache-Limit" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:208 +#: apt.conf.5.xml:216 msgid "" "APT uses since version 0.7.26 a resizable memory mapped cache file to store " "the 'available' information. <literal>Cache-Start</literal> acts as a hint " @@ -5958,24 +6040,24 @@ msgstr "" "l'augmentation automatique de la taille du cache est désactivée." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:223 +#: apt.conf.5.xml:231 msgid "Build-Essential" msgstr "Build-Essential" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:224 +#: apt.conf.5.xml:232 msgid "Defines which package(s) are considered essential build dependencies." msgstr "" "Cette option définit les paquets qui sont considérés comme faisant partie " "des dépendances essentielles pour la construction de paquets." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:227 +#: apt.conf.5.xml:235 msgid "Get" msgstr "Get" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:228 +#: apt.conf.5.xml:236 msgid "" "The Get subsection controls the &apt-get; tool, please see its documentation " "for more information about the options here." @@ -5985,12 +6067,12 @@ msgstr "" "question." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:232 +#: apt.conf.5.xml:240 msgid "Cache" msgstr "Cache" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:233 +#: apt.conf.5.xml:241 msgid "" "The Cache subsection controls the &apt-cache; tool, please see its " "documentation for more information about the options here." @@ -6000,12 +6082,12 @@ msgstr "" "options en question." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:237 +#: apt.conf.5.xml:245 msgid "CDROM" msgstr "CDROM" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:238 +#: apt.conf.5.xml:246 msgid "" "The CDROM subsection controls the &apt-cdrom; tool, please see its " "documentation for more information about the options here." @@ -6015,17 +6097,17 @@ msgstr "" "options en question." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:244 +#: apt.conf.5.xml:252 msgid "The Acquire Group" msgstr "Le groupe Acquire" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:249 +#: apt.conf.5.xml:257 msgid "Check-Valid-Until" msgstr "Check-Valid-Until" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:250 +#: apt.conf.5.xml:258 msgid "" "Security related option defaulting to true as an expiring validation for a " "Release file prevents longtime replay attacks and can e.g. also help users " @@ -6045,22 +6127,30 @@ msgstr "" "ValidTime</literal> est alors utilisée." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:260 +#: apt.conf.5.xml:268 msgid "Max-ValidTime" msgstr "Max-ValidTime" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:261 -msgid "" -"Seconds the Release file should be considered valid after it was created. " -"The default is \"for ever\" (0) if the Release file of the archive doesn't " -"include a <literal>Valid-Until</literal> header. If it does then this date " -"is the default. The date from the Release file or the date specified by the " -"creation time of the Release file (<literal>Date</literal> header) plus the " -"seconds specified with this options are used to check if the validation of a " -"file has expired by using the earlier date of the two. Archive specific " -"settings can be made by appending the label of the archive to the option " -"name." +#: apt.conf.5.xml:269 +#, fuzzy +#| msgid "" +#| "Seconds the Release file should be considered valid after it was created. " +#| "The default is \"for ever\" (0) if the Release file of the archive " +#| "doesn't include a <literal>Valid-Until</literal> header. If it does then " +#| "this date is the default. The date from the Release file or the date " +#| "specified by the creation time of the Release file (<literal>Date</" +#| "literal> header) plus the seconds specified with this options are used to " +#| "check if the validation of a file has expired by using the earlier date " +#| "of the two. Archive specific settings can be made by appending the label " +#| "of the archive to the option name." +msgid "" +"Seconds the Release file should be considered valid after it was created " +"(indicated by the <literal>Date</literal> header). If the Release file " +"itself includes a <literal>Valid-Until</literal> header the earlier date of " +"the two is used as the expiration date. The default value is <literal>0</" +"literal> which stands for \"for ever\". Archive specific settings can be " +"made by appending the label of the archive to the option name." msgstr "" "Durée (en secondes) pendant laquelle un fichier Release est considéré comme " "valable, à partir du moment de sa création. La valeur par défaut est 0 " @@ -6074,12 +6164,51 @@ msgstr "" "défini en ajoutant l'étiquette de l'archive au nom de l'option." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:273 +#: apt.conf.5.xml:279 +#, fuzzy +#| msgid "Max-ValidTime" +msgid "Min-ValidTime" +msgstr "Max-ValidTime" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:280 +#, fuzzy +#| msgid "" +#| "Seconds the Release file should be considered valid after it was created. " +#| "The default is \"for ever\" (0) if the Release file of the archive " +#| "doesn't include a <literal>Valid-Until</literal> header. If it does then " +#| "this date is the default. The date from the Release file or the date " +#| "specified by the creation time of the Release file (<literal>Date</" +#| "literal> header) plus the seconds specified with this options are used to " +#| "check if the validation of a file has expired by using the earlier date " +#| "of the two. Archive specific settings can be made by appending the label " +#| "of the archive to the option name." +msgid "" +"Minimum of seconds the Release file should be considered valid after it was " +"created (indicated by the <literal>Date</literal> header). Use this if you " +"need to use a seldomly updated (local) mirror of a more regular updated " +"archive with a <literal>Valid-Until</literal> header instead of completely " +"disabling the expiration date checking. Archive specific settings can and " +"should be used by appending the label of the archive to the option name." +msgstr "" +"Durée (en secondes) pendant laquelle un fichier Release est considéré comme " +"valable, à partir du moment de sa création. La valeur par défaut est 0 " +"(fichier valable indéfiniment) si le fichier Release de l'archive ne " +"comporte pas d'en-tête <literal>Valid-Until</literal>. Dans le cas " +"contraire, c'est la valeur de cet en-tête qui est la valeur par défaut du " +"paramètre. La date du fichier Release ou la date indiquée dans l'en-tête " +"<literal>Date</literal>, augmentées du nombre de secondes indiquées sont " +"comparées à la date courante pour déterminer si un fichier Release donné est " +"obsolète ou pas. Un réglage spécifique pour une archive donnée peut être " +"défini en ajoutant l'étiquette de l'archive au nom de l'option." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: apt.conf.5.xml:290 msgid "PDiffs" msgstr "PDiffs" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:274 +#: apt.conf.5.xml:291 msgid "" "Try to download deltas called <literal>PDiffs</literal> for Packages or " "Sources files instead of downloading whole ones. True by default." @@ -6089,7 +6218,7 @@ msgstr "" "télécharger entièrement. Par défaut à « true »." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:277 +#: apt.conf.5.xml:294 msgid "" "Two sub-options to limit the use of PDiffs are also available: With " "<literal>FileLimit</literal> can be specified how many PDiff files are " @@ -6108,12 +6237,12 @@ msgstr "" "fichiers de différences." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:286 +#: apt.conf.5.xml:303 msgid "Queue-Mode" msgstr "Queue-Mode" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:287 +#: apt.conf.5.xml:304 msgid "" "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</" "literal> or <literal>access</literal> which determines how APT parallelizes " @@ -6129,12 +6258,12 @@ msgstr "" "initiée." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:294 +#: apt.conf.5.xml:311 msgid "Retries" msgstr "Retries" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:295 +#: apt.conf.5.xml:312 msgid "" "Number of retries to perform. If this is non-zero APT will retry failed " "files the given number of times." @@ -6144,12 +6273,12 @@ msgstr "" "échoué." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:299 +#: apt.conf.5.xml:316 msgid "Source-Symlinks" msgstr "Source-Symlinks" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:300 +#: apt.conf.5.xml:317 msgid "" "Use symlinks for source archives. If set to true then source archives will " "be symlinked when possible instead of copying. True is the default." @@ -6159,12 +6288,12 @@ msgstr "" "archives de sources au lieu de les copier. Par défaut à « true »." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:304 sources.list.5.xml:144 +#: apt.conf.5.xml:321 sources.list.5.xml:155 msgid "http" msgstr "http" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:305 +#: apt.conf.5.xml:322 msgid "" "HTTP URIs; http::Proxy is the default http proxy to use. It is in the " "standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per " @@ -6184,7 +6313,7 @@ msgstr "" "options de mandataire HTTP." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:313 +#: apt.conf.5.xml:330 msgid "" "Three settings are provided for cache control with HTTP/1.1 compliant proxy " "caches. <literal>No-Cache</literal> tells the proxy to not use its cached " @@ -6209,7 +6338,7 @@ msgstr "" "en compte aucune de ces options." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:323 apt.conf.5.xml:387 +#: apt.conf.5.xml:340 apt.conf.5.xml:404 msgid "" "The option <literal>timeout</literal> sets the timeout timer used by the " "method, this applies to all things including connection timeout and data " @@ -6220,7 +6349,7 @@ msgstr "" "données." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:326 +#: apt.conf.5.xml:343 msgid "" "One setting is provided to control the pipeline depth in cases where the " "remote server is not RFC conforming or buggy (such as Squid 2.0.2). " @@ -6240,7 +6369,7 @@ msgstr "" "cette option ne respectent pas la RFC 2068." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:334 +#: apt.conf.5.xml:351 msgid "" "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</" "literal> which accepts integer values in kilobyte. The default value is 0 " @@ -6255,7 +6384,7 @@ msgstr "" "implicitement le téléchargement simultané depuis plusieurs serveurs." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:339 +#: apt.conf.5.xml:356 msgid "" "<literal>Acquire::http::User-Agent</literal> can be used to set a different " "User-Agent for the http download method as some proxies allow access for " @@ -6267,12 +6396,12 @@ msgstr "" "n'autorisent l'accès qu'aux client s'identifiant de manière spécifique.." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:345 +#: apt.conf.5.xml:362 msgid "https" msgstr "https" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:346 +#: apt.conf.5.xml:363 msgid "" "HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy " "options are the same as for <literal>http</literal> method and will also " @@ -6288,7 +6417,7 @@ msgstr "" "encore gérée." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:352 +#: apt.conf.5.xml:369 msgid "" "<literal>CaInfo</literal> suboption specifies place of file that holds info " "about trusted certificates. <literal><host>::CaInfo</literal> is " @@ -6320,12 +6449,12 @@ msgstr "" "ou 'SSLv3'." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:370 sources.list.5.xml:155 +#: apt.conf.5.xml:387 sources.list.5.xml:166 msgid "ftp" msgstr "ftp" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:371 +#: apt.conf.5.xml:388 msgid "" "FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard " "form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host " @@ -6360,7 +6489,7 @@ msgstr "" "correspond à l'élément respectif de l'URI." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:390 +#: apt.conf.5.xml:407 msgid "" "Several settings are provided to control passive mode. Generally it is safe " "to leave passive mode on, it works in nearly every environment. However " @@ -6377,7 +6506,7 @@ msgstr "" "modèle de fichier de configuration)." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:397 +#: apt.conf.5.xml:414 msgid "" "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</" "envar> environment variable to a http url - see the discussion of the http " @@ -6392,7 +6521,7 @@ msgstr "" "efficacité de cette méthode." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:402 +#: apt.conf.5.xml:419 msgid "" "The setting <literal>ForceExtended</literal> controls the use of RFC2428 " "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is " @@ -6408,18 +6537,18 @@ msgstr "" "des serveurs FTP ne suivent pas la RFC 2428." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:409 sources.list.5.xml:137 +#: apt.conf.5.xml:426 sources.list.5.xml:148 msgid "cdrom" msgstr "cdrom" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:415 +#: apt.conf.5.xml:432 #, no-wrap msgid "/cdrom/::Mount \"foo\";" msgstr "/cdrom/::Mount \"foo\";" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:410 +#: apt.conf.5.xml:427 msgid "" "CDROM URIs; the only setting for CDROM URIs is the mount point, " "<literal>cdrom::Mount</literal> which must be the mount point for the CDROM " @@ -6441,12 +6570,12 @@ msgstr "" "spécifiées en utilisant <literal>UMount</literal>." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:420 +#: apt.conf.5.xml:437 msgid "gpgv" msgstr "gpgv" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:421 +#: apt.conf.5.xml:438 msgid "" "GPGV URIs; the only option for GPGV URIs is the option to pass additional " "parameters to gpgv. <literal>gpgv::Options</literal> Additional options " @@ -6457,18 +6586,18 @@ msgstr "" "supplémentaires passées à gpgv." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:426 +#: apt.conf.5.xml:443 msgid "CompressionTypes" msgstr "CompressionTypes" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:432 +#: apt.conf.5.xml:449 #, no-wrap msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";" msgstr "Acquire::CompressionTypes::<replaceable>ExtensionFichier</replaceable> \"<replaceable>NomMethode</replaceable>\";" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:427 +#: apt.conf.5.xml:444 msgid "" "List of compression types which are understood by the acquire methods. " "Files like <filename>Packages</filename> can be available in various " @@ -6488,19 +6617,19 @@ msgstr "" "type=\"synopsis\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:437 +#: apt.conf.5.xml:454 #, no-wrap msgid "Acquire::CompressionTypes::Order:: \"gz\";" msgstr "Acquire::CompressionTypes::Order:: \"gz\";" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:440 +#: apt.conf.5.xml:457 #, no-wrap msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:433 +#: apt.conf.5.xml:450 msgid "" "Also the <literal>Order</literal> subgroup can be used to define in which " "order the acquire system will try to download the compressed files. The " @@ -6531,13 +6660,13 @@ msgstr "" "<literal>bz2</literal> à liste car il sera ajouté automatiquement." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:444 +#: apt.conf.5.xml:461 #, no-wrap msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:442 +#: apt.conf.5.xml:459 #, fuzzy #| msgid "" #| "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</" @@ -6575,7 +6704,7 @@ msgstr "" "elle sera simplement préfixée avec l'option en question." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:449 +#: apt.conf.5.xml:466 msgid "" "The special type <literal>uncompressed</literal> can be used to give " "uncompressed files a preference, but note that most archives don't provide " @@ -6587,12 +6716,12 @@ msgstr "" "surtout destiné aux miroirs locaux." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:454 +#: apt.conf.5.xml:471 msgid "GzipIndexes" msgstr "GzipIndexes" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:456 +#: apt.conf.5.xml:473 msgid "" "When downloading <literal>gzip</literal> compressed indexes (Packages, " "Sources, or Translations), keep them gzip compressed locally instead of " @@ -6607,12 +6736,12 @@ msgstr "" "(« False »)." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:463 +#: apt.conf.5.xml:480 msgid "Languages" msgstr "Langues" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:464 +#: apt.conf.5.xml:481 msgid "" "The Languages subsection controls which <filename>Translation</filename> " "files are downloaded and in which order APT tries to display the Description-" @@ -6634,13 +6763,13 @@ msgstr "" "sur ce qui est disponible avant d'établir des réglages impossibles." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting> -#: apt.conf.5.xml:480 +#: apt.conf.5.xml:497 #, no-wrap msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" msgstr "Acquire::Languages { \"environment\"; \"fr\"; \"en\"; \"none\"; \"de\"; };" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:470 +#: apt.conf.5.xml:487 msgid "" "The default list includes \"environment\" and \"en\". " "\"<literal>environment</literal>\" has a special meaning here: It will be " @@ -6682,7 +6811,7 @@ msgstr "" "\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:245 +#: apt.conf.5.xml:253 msgid "" "The <literal>Acquire</literal> group of options controls the download of " "packages and the URI handlers. <placeholder type=\"variablelist\" id=\"0\"/>" @@ -6692,12 +6821,12 @@ msgstr "" "id=\"0\"/>" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:487 +#: apt.conf.5.xml:504 msgid "Directories" msgstr "Les répertoires" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:489 +#: apt.conf.5.xml:506 msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " "local state information. <literal>lists</literal> is the directory to place " @@ -6717,7 +6846,7 @@ msgstr "" "filename>." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:496 +#: apt.conf.5.xml:513 msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " "information, such as the two package caches <literal>srcpkgcache</literal> " @@ -6740,7 +6869,7 @@ msgstr "" "Cache</literal>." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:505 +#: apt.conf.5.xml:522 msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " "<literal>sourcelist</literal> gives the location of the sourcelist and " @@ -6755,7 +6884,7 @@ msgstr "" "fichier de configuration indiqué par la variable <envar>APT_CONFIG</envar>)." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:511 +#: apt.conf.5.xml:528 msgid "" "The <literal>Dir::Parts</literal> setting reads in all the config fragments " "in lexical order from the directory specified. After this is done then the " @@ -6766,7 +6895,7 @@ msgstr "" "configuration est chargé." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:515 +#: apt.conf.5.xml:532 msgid "" "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::" "Bin::Methods</literal> specifies the location of the method handlers and " @@ -6784,7 +6913,7 @@ msgstr "" "programmes correspondants." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:523 +#: apt.conf.5.xml:540 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@ -6806,7 +6935,7 @@ msgstr "" "staging/var/lib/dpkg/status</filename>." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:536 +#: apt.conf.5.xml:553 msgid "" "The <literal>Ignore-Files-Silently</literal> list can be used to specify " "which files APT should silently ignore while parsing the files in the " @@ -6824,12 +6953,12 @@ msgstr "" "est possible d'utiliser la syntaxe des expressions rationnelles." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:545 +#: apt.conf.5.xml:562 msgid "APT in DSelect" msgstr "APT et DSelect" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:547 +#: apt.conf.5.xml:564 msgid "" "When APT is used as a &dselect; method several configuration directives " "control the default behaviour. These are in the <literal>DSelect</literal> " @@ -6840,12 +6969,12 @@ msgstr "" "<literal>DSelect</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:551 +#: apt.conf.5.xml:568 msgid "Clean" msgstr "Clean" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:552 +#: apt.conf.5.xml:569 msgid "" "Cache Clean mode; this value may be one of always, prompt, auto, pre-auto " "and never. always and prompt will remove all packages from the cache after " @@ -6863,7 +6992,7 @@ msgstr "" "supprime avant de récupérer de nouveaux paquets." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:561 +#: apt.conf.5.xml:578 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the install phase." @@ -6872,12 +7001,12 @@ msgstr "" "&apt-get; lors de la phase d'installation." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:565 +#: apt.conf.5.xml:582 msgid "Updateoptions" msgstr "UpdateOptions" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:566 +#: apt.conf.5.xml:583 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the update phase." @@ -6886,12 +7015,12 @@ msgstr "" "&apt-get; lors de la phase de mise à jour." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:570 +#: apt.conf.5.xml:587 msgid "PromptAfterUpdate" msgstr "PromptAfterUpdate" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:571 +#: apt.conf.5.xml:588 msgid "" "If true the [U]pdate operation in &dselect; will always prompt to continue. " "The default is to prompt only on error." @@ -6901,12 +7030,12 @@ msgstr "" "d'erreur que l'on propose à l'utilisateur d'intervenir." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:577 +#: apt.conf.5.xml:594 msgid "How APT calls dpkg" msgstr "Méthode d'appel de &dpkg; par APT" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:578 +#: apt.conf.5.xml:595 msgid "" "Several configuration directives control how APT invokes &dpkg;. These are " "in the <literal>DPkg</literal> section." @@ -6915,7 +7044,7 @@ msgstr "" "&dpkg; : elles figurent dans la section <literal>DPkg</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:583 +#: apt.conf.5.xml:600 msgid "" "This is a list of options to pass to dpkg. The options must be specified " "using the list notation and each list item is passed as a single argument to " @@ -6926,17 +7055,17 @@ msgstr "" "est passé comme un seul paramètre à &dpkg;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:588 +#: apt.conf.5.xml:605 msgid "Pre-Invoke" msgstr "Pre-Invoke" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:588 +#: apt.conf.5.xml:605 msgid "Post-Invoke" msgstr "Post-Invoke" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:589 +#: apt.conf.5.xml:606 msgid "" "This is a list of shell commands to run before/after invoking &dpkg;. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -6949,12 +7078,12 @@ msgstr "" "<filename>/bin/sh</filename> : APT s'arrête dès que l'une d'elles échoue." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:595 +#: apt.conf.5.xml:612 msgid "Pre-Install-Pkgs" msgstr "Pre-Install-Pkgs" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:596 +#: apt.conf.5.xml:613 msgid "" "This is a list of shell commands to run before invoking dpkg. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -6970,7 +7099,7 @@ msgstr "" "qu'il va installer, à raison d'un par ligne." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:602 +#: apt.conf.5.xml:619 msgid "" "Version 2 of this protocol dumps more information, including the protocol " "version, the APT configuration space and the packages, files and versions " @@ -6986,12 +7115,12 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:609 +#: apt.conf.5.xml:626 msgid "Run-Directory" msgstr "Run-Directory" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:610 +#: apt.conf.5.xml:627 msgid "" "APT chdirs to this directory before invoking dpkg, the default is <filename>/" "</filename>." @@ -7000,12 +7129,12 @@ msgstr "" "le répertoire <filename>/</filename>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:614 +#: apt.conf.5.xml:631 msgid "Build-options" msgstr "Build-options" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:615 +#: apt.conf.5.xml:632 msgid "" "These options are passed to &dpkg-buildpackage; when compiling packages, the " "default is to disable signing and produce all binaries." @@ -7015,14 +7144,14 @@ msgstr "" "créés." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt.conf.5.xml:620 +#: apt.conf.5.xml:637 msgid "dpkg trigger usage (and related options)" msgstr "" "utilisation des actions différées (« triggers ») de dpkg (et options " "associées)" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:621 +#: apt.conf.5.xml:638 msgid "" "APT can call dpkg in a way so it can make aggressive use of triggers over " "multiple calls of dpkg. Without further options dpkg will use triggers only " @@ -7049,7 +7178,7 @@ msgstr "" "configuration des paquets." #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> -#: apt.conf.5.xml:636 +#: apt.conf.5.xml:653 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@ -7063,7 +7192,7 @@ msgstr "" "DPkg::TriggersPending \"true\";" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:630 +#: apt.conf.5.xml:647 msgid "" "Note that it is not guaranteed that APT will support these options or that " "these options will not cause (big) trouble in the future. If you have " @@ -7087,12 +7216,12 @@ msgstr "" "type=\"literallayout\" id=\"0\"/>." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:642 +#: apt.conf.5.xml:659 msgid "DPkg::NoTriggers" msgstr "DPkg::NoTriggers" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:643 +#: apt.conf.5.xml:660 msgid "" "Add the no triggers flag to all dpkg calls (except the ConfigurePending " "call). See &dpkg; if you are interested in what this actually means. In " @@ -7114,12 +7243,12 @@ msgstr "" "options « unpack » et « remove »." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:650 +#: apt.conf.5.xml:667 msgid "PackageManager::Configure" msgstr "PackageManager::Configure" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:651 +#: apt.conf.5.xml:668 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default " @@ -7147,12 +7276,12 @@ msgstr "" "configuré et donc éventuellement non amorçable." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:661 +#: apt.conf.5.xml:678 msgid "DPkg::ConfigurePending" msgstr "DPkg::ConfigurePending" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:662 +#: apt.conf.5.xml:679 msgid "" "If this option is set apt will call <command>dpkg --configure --pending</" "command> to let dpkg handle all required configurations and triggers. This " @@ -7171,12 +7300,12 @@ msgstr "" "peut conserver l'option active." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:668 +#: apt.conf.5.xml:685 msgid "DPkg::TriggersPending" msgstr "DPkg::TriggersPending" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:669 +#: apt.conf.5.xml:686 msgid "" "Useful for <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal> and dpkg " @@ -7194,12 +7323,12 @@ msgstr "" "celles concernant le paquet en cours de traitement." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:674 +#: apt.conf.5.xml:691 msgid "PackageManager::UnpackAll" msgstr "PackageManager::UnpackAll" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:675 +#: apt.conf.5.xml:692 msgid "" "As the configuration can be deferred to be done at the end by dpkg it can be " "tried to order the unpack series only by critical needs, e.g. by Pre-" @@ -7224,12 +7353,12 @@ msgstr "" "traduction n'est pas exclu...)." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:682 +#: apt.conf.5.xml:699 msgid "OrderList::Score::Immediate" msgstr "OrderList::Score::Immediate" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:690 +#: apt.conf.5.xml:707 #, no-wrap msgid "" "OrderList::Score {\n" @@ -7247,7 +7376,7 @@ msgstr "" "};" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:683 +#: apt.conf.5.xml:700 msgid "" "Essential packages (and there dependencies) should be configured immediately " "after unpacking. It will be a good idea to do this quite early in the " @@ -7273,12 +7402,12 @@ msgstr "" "id=\"0\"/>" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:703 +#: apt.conf.5.xml:720 msgid "Periodic and Archives options" msgstr "Options « Periodic » et « Archive »" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:704 +#: apt.conf.5.xml:721 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by " @@ -7290,12 +7419,12 @@ msgstr "" "script <literal>/etc/cron.daily/apt</literal>, lancé quotidiennement." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:712 +#: apt.conf.5.xml:729 msgid "Debug options" msgstr "Les options de débogage" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:714 +#: apt.conf.5.xml:731 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@ -7313,7 +7442,7 @@ msgstr "" "peuvent tout de même être utiles :" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:725 +#: apt.conf.5.xml:742 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</" @@ -7324,7 +7453,7 @@ msgstr "" "upgrade, upgrade, install, remove et purge</literal>." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:733 +#: apt.conf.5.xml:750 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s install</" @@ -7336,7 +7465,7 @@ msgstr "" "superutilisateur." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:742 +#: apt.conf.5.xml:759 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@ -7348,7 +7477,7 @@ msgstr "" #. motivating example, except I haven't a clue why you'd want #. to do this. #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:750 +#: apt.conf.5.xml:767 msgid "" "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " "in CDROM IDs." @@ -7357,17 +7486,17 @@ msgstr "" "type statfs dans les identifiants de CD." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:760 +#: apt.conf.5.xml:777 msgid "A full list of debugging options to apt follows." msgstr "Liste complète des options de débogage de APT :" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:765 +#: apt.conf.5.xml:782 msgid "<literal>Debug::Acquire::cdrom</literal>" msgstr "<literal>Debug::Acquire::cdrom</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:769 +#: apt.conf.5.xml:786 msgid "" "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" @@ -7375,44 +7504,44 @@ msgstr "" "literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:776 +#: apt.conf.5.xml:793 msgid "<literal>Debug::Acquire::ftp</literal>" msgstr "<literal>Debug::Acquire::ftp</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:780 +#: apt.conf.5.xml:797 msgid "Print information related to downloading packages using FTP." msgstr "" "Affiche les informations concernant le téléchargement de paquets par FTP." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:787 +#: apt.conf.5.xml:804 msgid "<literal>Debug::Acquire::http</literal>" msgstr "<literal>Debug::Acquire::http</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:791 +#: apt.conf.5.xml:808 msgid "Print information related to downloading packages using HTTP." msgstr "" "Affiche les informations concernant le téléchargement de paquets par HTTP." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:798 +#: apt.conf.5.xml:815 msgid "<literal>Debug::Acquire::https</literal>" msgstr "<literal>Debug::Acquire::https</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:802 +#: apt.conf.5.xml:819 msgid "Print information related to downloading packages using HTTPS." msgstr "Print information related to downloading packages using HTTPS." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:809 +#: apt.conf.5.xml:826 msgid "<literal>Debug::Acquire::gpgv</literal>" msgstr "<literal>Debug::Acquire::gpgv</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:813 +#: apt.conf.5.xml:830 msgid "" "Print information related to verifying cryptographic signatures using " "<literal>gpg</literal>." @@ -7421,12 +7550,12 @@ msgstr "" "cryptographiques avec <literal>gpg</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:820 +#: apt.conf.5.xml:837 msgid "<literal>Debug::aptcdrom</literal>" msgstr "<literal>Debug::aptcdrom</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:824 +#: apt.conf.5.xml:841 msgid "" "Output information about the process of accessing collections of packages " "stored on CD-ROMs." @@ -7435,24 +7564,24 @@ msgstr "" "stockées sur CD." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:831 +#: apt.conf.5.xml:848 msgid "<literal>Debug::BuildDeps</literal>" msgstr "<literal>Debug::BuildDeps</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:834 +#: apt.conf.5.xml:851 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" "Décrit le processus de résolution des dépendances pour la construction de " "paquets source ( « build-dependencies » ) par &apt-get;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:841 +#: apt.conf.5.xml:858 msgid "<literal>Debug::Hashes</literal>" msgstr "<literal>Debug::Hashes</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:844 +#: apt.conf.5.xml:861 msgid "" "Output each cryptographic hash that is generated by the <literal>apt</" "literal> libraries." @@ -7461,12 +7590,12 @@ msgstr "" "librairies d'<literal>apt</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:851 +#: apt.conf.5.xml:868 msgid "<literal>Debug::IdentCDROM</literal>" msgstr "<literal>Debug::IdentCDROM</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:854 +#: apt.conf.5.xml:871 msgid "" "Do not include information from <literal>statfs</literal>, namely the number " "of used and free blocks on the CD-ROM filesystem, when generating an ID for " @@ -7477,12 +7606,12 @@ msgstr "" "utilisés sur le système de fichier du CD." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:862 +#: apt.conf.5.xml:879 msgid "<literal>Debug::NoLocking</literal>" msgstr "<literal>Debug::NoLocking</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:865 +#: apt.conf.5.xml:882 msgid "" "Disable all file locking. For instance, this will allow two instances of " "<quote><literal>apt-get update</literal></quote> to run at the same time." @@ -7492,24 +7621,24 @@ msgstr "" "temps." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:873 +#: apt.conf.5.xml:890 msgid "<literal>Debug::pkgAcquire</literal>" msgstr "<literal>Debug::pkgAcquire</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:877 +#: apt.conf.5.xml:894 msgid "Log when items are added to or removed from the global download queue." msgstr "" "Trace les ajouts et suppressions d'éléments de la queue globale de " "téléchargement." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:884 +#: apt.conf.5.xml:901 msgid "<literal>Debug::pkgAcquire::Auth</literal>" msgstr "<literal>Debug::pkgAcquire::Auth</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:887 +#: apt.conf.5.xml:904 msgid "" "Output status messages and errors related to verifying checksums and " "cryptographic signatures of downloaded files." @@ -7519,12 +7648,12 @@ msgstr "" "éventuelles." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:894 +#: apt.conf.5.xml:911 msgid "<literal>Debug::pkgAcquire::Diffs</literal>" msgstr "<literal>Debug::pkgAcquire::Diffs</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:897 +#: apt.conf.5.xml:914 msgid "" "Output information about downloading and applying package index list diffs, " "and errors relating to package index list diffs." @@ -7534,12 +7663,12 @@ msgstr "" "éventuelles." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:905 +#: apt.conf.5.xml:922 msgid "<literal>Debug::pkgAcquire::RRed</literal>" msgstr "<literal>Debug::pkgAcquire::RRed</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:909 +#: apt.conf.5.xml:926 msgid "" "Output information related to patching apt package lists when downloading " "index diffs instead of full indices." @@ -7549,12 +7678,12 @@ msgstr "" "place des fichiers complets." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:916 +#: apt.conf.5.xml:933 msgid "<literal>Debug::pkgAcquire::Worker</literal>" msgstr "<literal>Debug::pkgAcquire::Worker</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:920 +#: apt.conf.5.xml:937 msgid "" "Log all interactions with the sub-processes that actually perform downloads." msgstr "" @@ -7562,12 +7691,12 @@ msgstr "" "effectivement des téléchargements." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:927 +#: apt.conf.5.xml:944 msgid "<literal>Debug::pkgAutoRemove</literal>" msgstr "<literal>Debug::pkgAutoRemove</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:931 +#: apt.conf.5.xml:948 msgid "" "Log events related to the automatically-installed status of packages and to " "the removal of unused packages." @@ -7576,12 +7705,12 @@ msgstr "" "automatiquement, et la suppression des paquets inutiles." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:938 +#: apt.conf.5.xml:955 msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>" msgstr "<literal>Debug::pkgDepCache::AutoInstall</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:941 +#: apt.conf.5.xml:958 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial auto-" @@ -7596,12 +7725,12 @@ msgstr "" "de APT ; voir <literal>Debug::pkgProblemResolver</literal> pour ce dernier." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:952 +#: apt.conf.5.xml:969 msgid "<literal>Debug::pkgDepCache::Marker</literal>" msgstr "<literal>Debug::pkgDepCache::Marker</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:955 +#: apt.conf.5.xml:972 msgid "" "Generate debug messages describing which package is marked as keep/install/" "remove while the ProblemResolver does his work. Each addition or deletion " @@ -7636,24 +7765,24 @@ msgstr "" "de APT ; voir <literal>Debug::pkgProblemResolver</literal> pour ce dernier." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:974 +#: apt.conf.5.xml:991 msgid "<literal>Debug::pkgInitConfig</literal>" msgstr "<literal>Debug::pkgInitConfig</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:977 +#: apt.conf.5.xml:994 msgid "Dump the default configuration to standard error on startup." msgstr "" "Affiche, au lancement, l'ensemble de la configuration sur la sortie d'erreur " "standard." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:984 +#: apt.conf.5.xml:1001 msgid "<literal>Debug::pkgDPkgPM</literal>" msgstr "<literal>Debug::pkgDPkgPM</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:987 +#: apt.conf.5.xml:1004 msgid "" "When invoking &dpkg;, output the precise command line with which it is being " "invoked, with arguments separated by a single space character." @@ -7662,12 +7791,12 @@ msgstr "" "paramètres sont séparés par des espaces." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:995 +#: apt.conf.5.xml:1012 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" msgstr "<literal>Debug::pkgDPkgProgressReporting</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:998 +#: apt.conf.5.xml:1015 msgid "" "Output all the data received from &dpkg; on the status file descriptor and " "any errors encountered while parsing it." @@ -7677,12 +7806,12 @@ msgstr "" "fichier." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1005 +#: apt.conf.5.xml:1022 msgid "<literal>Debug::pkgOrderList</literal>" msgstr "<literal>Debug::pkgOrderList</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1009 +#: apt.conf.5.xml:1026 msgid "" "Generate a trace of the algorithm that decides the order in which " "<literal>apt</literal> should pass packages to &dpkg;." @@ -7691,33 +7820,33 @@ msgstr "" "<literal>apt</literal> passe les paquets à &dpkg;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1017 +#: apt.conf.5.xml:1034 msgid "<literal>Debug::pkgPackageManager</literal>" msgstr "<literal>Debug::pkgPackageManager</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1021 +#: apt.conf.5.xml:1038 msgid "" "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "Affiche le détail des opérations liées à l'invocation de &dpkg;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1028 +#: apt.conf.5.xml:1045 msgid "<literal>Debug::pkgPolicy</literal>" msgstr "<literal>Debug::pkgPolicy</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1032 +#: apt.conf.5.xml:1049 msgid "Output the priority of each package list on startup." msgstr "Affiche, au lancement, la priorité de chaque liste de paquets." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1038 +#: apt.conf.5.xml:1055 msgid "<literal>Debug::pkgProblemResolver</literal>" msgstr "<literal>Debug::pkgProblemResolver</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1042 +#: apt.conf.5.xml:1059 msgid "" "Trace the execution of the dependency resolver (this applies only to what " "happens when a complex dependency problem is encountered)." @@ -7726,12 +7855,12 @@ msgstr "" "concerne que les cas où un problème de dépendances complexe se présente)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1050 +#: apt.conf.5.xml:1067 msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>" msgstr "<literal>Debug::pkgProblemResolver::ShowScores</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1053 +#: apt.conf.5.xml:1070 msgid "" "Display a list of all installed packages with their calculated score used by " "the pkgProblemResolver. The description of the package is the same as " @@ -7742,12 +7871,12 @@ msgstr "" "est décrite dans <literal>Debug::pkgDepCache::Marker</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1061 +#: apt.conf.5.xml:1078 msgid "<literal>Debug::sourceList</literal>" msgstr "<literal>Debug::sourceList</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1065 +#: apt.conf.5.xml:1082 msgid "" "Print information about the vendors read from <filename>/etc/apt/vendors." "list</filename>." @@ -7756,7 +7885,7 @@ msgstr "" "list</filename>." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1088 +#: apt.conf.5.xml:1105 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." @@ -7765,13 +7894,13 @@ msgstr "" "exemples pour toutes les options existantes." #. type: Content of: <refentry><refsect1><variablelist> -#: apt.conf.5.xml:1095 +#: apt.conf.5.xml:1112 msgid "&file-aptconf;" msgstr "&file-aptconf;" #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1100 +#: apt.conf.5.xml:1117 msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "&apt-cache;, &apt-config;, &apt-preferences;." @@ -9280,8 +9409,9 @@ msgstr "" #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml:81 -#, no-wrap -msgid "deb uri distribution [component1] [component2] [...]" +#, fuzzy, no-wrap +#| msgid "deb uri distribution [component1] [component2] [...]" +msgid "deb [ options ] uri distribution [component1] [component2] [...]" msgstr "deb uri distribution [composant1] [composant2] [...]" #. type: Content of: <refentry><refsect1><para> @@ -9352,6 +9482,27 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:112 msgid "" +"<literal>options</literal> is always optional and needs to be surounded by " +"square brackets. It can consist of multiple settings in the form " +"<literal><replaceable>setting</replaceable>=<replaceable>value</" +"replaceable></literal>. Multiple settings are separated by spaces. The " +"following settings are supported by APT, note though that unsupported " +"settings will be ignored silently:" +msgstr "" + +#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> +#: sources.list.5.xml:117 +msgid "" +"<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</" +"replaceable>,…</literal> can be used to specify for which architectures " +"packages information should be downloaded. If this option is not set all " +"architectures defined by the <literal>APT::Architectures</literal> option " +"will be downloaded." +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:123 +msgid "" "It is important to list sources in order of preference, with the most " "preferred source listed first. Typically this will result in sorting by " "speed from fastest to slowest (CD-ROM followed by hosts on a local network, " @@ -9363,12 +9514,12 @@ msgstr "" "les hôtes distants." #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:117 +#: sources.list.5.xml:128 msgid "Some examples:" msgstr "Exemples :" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:119 +#: sources.list.5.xml:130 #, no-wrap msgid "" "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n" @@ -9380,17 +9531,17 @@ msgstr "" " " #. type: Content of: <refentry><refsect1><title> -#: sources.list.5.xml:125 +#: sources.list.5.xml:136 msgid "URI specification" msgstr "Spécification des URI" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: sources.list.5.xml:130 +#: sources.list.5.xml:141 msgid "file" msgstr "file" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:132 +#: sources.list.5.xml:143 msgid "" "The file scheme allows an arbitrary directory in the file system to be " "considered an archive. This is useful for NFS mounts and local mirrors or " @@ -9401,7 +9552,7 @@ msgstr "" "avec les montages NFS, les miroirs et les archives locaux." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:139 +#: sources.list.5.xml:150 msgid "" "The cdrom scheme allows APT to use a local CDROM drive with media swapping. " "Use the &apt-cdrom; program to create cdrom entries in the source list." @@ -9411,7 +9562,7 @@ msgstr "" "pour créer des entrées dans la liste des sources." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:146 +#: sources.list.5.xml:157 msgid "" "The http scheme specifies an HTTP server for the archive. If an environment " "variable <envar>http_proxy</envar> is set with the format http://server:" @@ -9428,7 +9579,7 @@ msgstr "" "Notez qu'il s'agit d'une méthode d'authentification peu sûre." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:157 +#: sources.list.5.xml:168 msgid "" "The ftp scheme specifies an FTP server for the archive. APT's FTP behavior " "is highly configurable; for more information see the &apt-conf; manual page. " @@ -9448,12 +9599,12 @@ msgstr "" "et qui sont spécifiés dans le fichier de configuration seront ignorés." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: sources.list.5.xml:166 +#: sources.list.5.xml:177 msgid "copy" msgstr "copy" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:168 +#: sources.list.5.xml:179 msgid "" "The copy scheme is identical to the file scheme except that packages are " "copied into the cache directory instead of used directly at their location. " @@ -9465,17 +9616,17 @@ msgstr "" "gens qui utilisent un disque zip pour recopier des fichiers avec APT." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: sources.list.5.xml:173 +#: sources.list.5.xml:184 msgid "rsh" msgstr "rsh" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: sources.list.5.xml:173 +#: sources.list.5.xml:184 msgid "ssh" msgstr "ssh" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:175 +#: sources.list.5.xml:186 msgid "" "The rsh/ssh method invokes rsh/ssh to connect to a remote host as a given " "user and access the files. It is a good idea to do prior arrangements with " @@ -9490,12 +9641,12 @@ msgstr "" "commandes standard <command>find</command> et <command>dd</command>." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: sources.list.5.xml:183 +#: sources.list.5.xml:194 msgid "more recognizable URI types" msgstr "plus de types d'URI simples à reconnaître" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:185 +#: sources.list.5.xml:196 msgid "" "APT can be extended with more methods shipped in other optional packages " "which should follow the nameing scheme <literal>apt-transport-" @@ -9517,7 +9668,7 @@ msgstr "" "citerefentry>)." #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:127 +#: sources.list.5.xml:138 msgid "" "The currently recognized URI types are cdrom, file, http, ftp, copy, ssh, " "rsh. <placeholder type=\"variablelist\" id=\"0\"/>" @@ -9526,7 +9677,7 @@ msgstr "" "ssh et rsh. <placeholder type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:199 +#: sources.list.5.xml:210 msgid "" "Uses the archive stored locally (or NFS mounted) at /home/jason/debian for " "stable/main, stable/contrib, and stable/non-free." @@ -9535,37 +9686,60 @@ msgstr "" "debian pour stable/main, stable/contrib et stable/non-free." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:201 +#: sources.list.5.xml:212 #, no-wrap msgid "deb file:/home/jason/debian stable main contrib non-free" msgstr "deb file:/home/jason/debian stable main contrib non-free" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:203 +#: sources.list.5.xml:214 msgid "As above, except this uses the unstable (development) distribution." msgstr "" "Comme ci-dessus, excepté que cette ligne utilise la distribution " "« unstable » (développement)." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:204 +#: sources.list.5.xml:215 #, no-wrap msgid "deb file:/home/jason/debian unstable main contrib non-free" msgstr "deb file:/home/jason/debian unstable main contrib non-free" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:206 +#: sources.list.5.xml:217 msgid "Source line for the above" msgstr "La précédente ligne, mais pour les sources." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:207 +#: sources.list.5.xml:218 #, no-wrap msgid "deb-src file:/home/jason/debian unstable main contrib non-free" msgstr "deb-src file:/home/jason/debian unstable main contrib non-free" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:209 +#: sources.list.5.xml:220 +msgid "" +"The first line gets package information for the architectures in " +"<literal>APT::Architectures</literal> while the second always retrieves " +"<literal>amd64</literal> and <literal>armel</literal>." +msgstr "" + +#. type: Content of: <refentry><refsect1><literallayout> +#: sources.list.5.xml:222 +#, fuzzy, no-wrap +#| msgid "" +#| "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n" +#| "deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n" +#| " " +msgid "" +"deb http://ftp.debian.org/debian &stable-codename; main\n" +"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main" +msgstr "" +"deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n" +"deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n" +" " + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:225 msgid "" "Uses HTTP to access the archive at archive.debian.org, and uses only the " "hamm/main area." @@ -9574,13 +9748,13 @@ msgstr "" "n'utiliser que la section hamm/main." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:211 +#: sources.list.5.xml:227 #, no-wrap msgid "deb http://archive.debian.org/debian-archive hamm main" msgstr "deb http://archive.debian.org/debian-archive hamm main" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:213 +#: sources.list.5.xml:229 msgid "" "Uses FTP to access the archive at ftp.debian.org, under the debian " "directory, and uses only the &stable-codename;/contrib area." @@ -9589,13 +9763,13 @@ msgstr "" "répertoire debian, et n'utiliser que la section &stable-codename;/contrib." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:215 +#: sources.list.5.xml:231 #, no-wrap msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib" msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:217 +#: sources.list.5.xml:233 msgid "" "Uses FTP to access the archive at ftp.debian.org, under the debian " "directory, and uses only the unstable/contrib area. If this line appears as " @@ -9608,19 +9782,19 @@ msgstr "" "apparaissent, une seule session FTP sera utilisée pour les deux lignes." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:221 +#: sources.list.5.xml:237 #, no-wrap msgid "deb ftp://ftp.debian.org/debian unstable contrib" msgstr "deb ftp://ftp.debian.org/debian unstable contrib" #. type: Content of: <refentry><refsect1><para><literallayout> -#: sources.list.5.xml:230 +#: sources.list.5.xml:246 #, no-wrap msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/" msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:223 +#: sources.list.5.xml:239 msgid "" "Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe " "directory, and uses only files found under <filename>unstable/binary-i386</" @@ -9640,7 +9814,7 @@ msgstr "" "type=\"literallayout\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:235 +#: sources.list.5.xml:251 msgid "&apt-cache; &apt-conf;" msgstr "&apt-cache; &apt-conf;" @@ -11206,6 +11380,13 @@ msgstr " # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade" msgid "Which will use the already fetched archives on the disc." msgstr "Cette commande utilisera les fichiers récupérés sur le disque." +#~ msgid "" +#~ "Update the local keyring with the keyring of Debian archive keys and " +#~ "removes from the keyring the archive keys which are no longer valid." +#~ msgstr "" +#~ "Mettre à jour le trousseau de clés local avec le trousseau de clés de " +#~ "l'archive Debian et supprimer les clés qui y sont périmées." + #~ msgid "<option>--md5</option>" #~ msgstr "<option>--md5</option>" diff --git a/doc/po/it.po b/doc/po/it.po index 2f917c8b3..148244138 100644 --- a/doc/po/it.po +++ b/doc/po/it.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2011-06-28 16:42+0200\n" +"POT-Creation-Date: 2011-11-20 17:58+0100\n" "PO-Revision-Date: 2003-04-26 23:26+0100\n" "Last-Translator: Traduzione di Eugenia Franzoni <eugenia@linuxcare.com>\n" "Language-Team: <debian-l10n-italian@lists.debian.org>\n" @@ -531,7 +531,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:64 apt-cdrom.8.xml:50 apt-config.8.xml:50 -#: apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:114 +#: apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:121 #: apt-key.8.xml:38 apt-mark.8.xml:56 apt-secure.8.xml:43 #: apt-sortpkgs.1.xml:47 apt.conf.5.xml:42 apt_preferences.5.xml:36 #: sources.list.5.xml:36 @@ -548,7 +548,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-cache.8.xml:70 apt-get.8.xml:120 +#: apt-cache.8.xml:70 apt-get.8.xml:127 msgid "" "Unless the <option>-h</option>, or <option>--help</option> option is given, " "one of the commands below must be present." @@ -910,8 +910,8 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:278 apt-config.8.xml:96 apt-extracttemplates.1.xml:59 -#: apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:126 -#: apt-sortpkgs.1.xml:57 apt.conf.5.xml:560 apt.conf.5.xml:582 +#: apt-ftparchive.1.xml:525 apt-get.8.xml:342 apt-mark.8.xml:126 +#: apt-sortpkgs.1.xml:57 apt.conf.5.xml:577 apt.conf.5.xml:599 msgid "options" msgstr "" @@ -934,7 +934,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:288 apt-ftparchive.1.xml:572 apt-get.8.xml:393 +#: apt-cache.8.xml:288 apt-ftparchive.1.xml:572 apt-get.8.xml:404 #: apt-sortpkgs.1.xml:61 msgid "<option>-s</option>" msgstr "" @@ -955,12 +955,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:383 +#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:394 msgid "<option>-q</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:383 +#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:394 msgid "<option>--quiet</option>" msgstr "" @@ -1042,7 +1042,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:323 apt-cdrom.8.xml:124 apt-get.8.xml:350 +#: apt-cache.8.xml:323 apt-cdrom.8.xml:124 apt-get.8.xml:361 msgid "<option>-f</option>" msgstr "" @@ -1060,6 +1060,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:584 +#: apt-get.8.xml:447 msgid "<option>-a</option>" msgstr "" @@ -1155,14 +1156,14 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist> #: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101 -#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:612 apt-get.8.xml:570 +#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:612 apt-get.8.xml:591 #: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67 msgid "&apt-commonoptions;" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:172 apt-mark.8.xml:144 -#: apt.conf.5.xml:1093 apt_preferences.5.xml:697 +#: apt-cache.8.xml:372 apt-get.8.xml:596 apt-key.8.xml:175 apt-mark.8.xml:144 +#: apt.conf.5.xml:1110 apt_preferences.5.xml:697 msgid "Files" msgstr "" @@ -1173,10 +1174,10 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106 -#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:628 apt-get.8.xml:585 -#: apt-key.8.xml:193 apt-mark.8.xml:150 apt-secure.8.xml:185 -#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:704 -#: sources.list.5.xml:234 +#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:628 apt-get.8.xml:606 +#: apt-key.8.xml:196 apt-mark.8.xml:150 apt-secure.8.xml:185 +#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1116 apt_preferences.5.xml:704 +#: sources.list.5.xml:250 msgid "See Also" msgstr "" @@ -1187,7 +1188,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111 -#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:632 apt-get.8.xml:591 +#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:632 apt-get.8.xml:612 #: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76 msgid "Diagnostics" msgstr "" @@ -1287,12 +1288,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-cdrom.8.xml:94 apt-key.8.xml:158 +#: apt-cdrom.8.xml:94 apt-key.8.xml:161 msgid "Options" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:540 apt-get.8.xml:345 +#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:540 apt-get.8.xml:356 msgid "<option>-d</option>" msgstr "" @@ -1328,7 +1329,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cdrom.8.xml:116 apt-get.8.xml:364 +#: apt-cdrom.8.xml:116 apt-get.8.xml:375 msgid "<option>-m</option>" msgstr "" @@ -1373,17 +1374,17 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cdrom.8.xml:143 apt-get.8.xml:395 +#: apt-cdrom.8.xml:143 apt-get.8.xml:406 msgid "<option>--just-print</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cdrom.8.xml:144 apt-get.8.xml:397 +#: apt-cdrom.8.xml:144 apt-get.8.xml:408 msgid "<option>--recon</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cdrom.8.xml:145 apt-get.8.xml:398 +#: apt-cdrom.8.xml:145 apt-get.8.xml:409 msgid "<option>--no-act</option>" msgstr "" @@ -1557,7 +1558,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-extracttemplates.1.xml:63 apt-get.8.xml:504 +#: apt-extracttemplates.1.xml:63 apt-get.8.xml:525 msgid "<option>-t</option>" msgstr "" @@ -1759,7 +1760,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:145 apt-get.8.xml:287 +#: apt-ftparchive.1.xml:145 apt-get.8.xml:298 msgid "clean" msgstr "" @@ -2217,8 +2218,8 @@ msgid "" "free</literal>" msgstr "" -#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:394 +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:394 apt.conf.5.xml:157 msgid "Architectures" msgstr "" @@ -2549,8 +2550,8 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:617 apt.conf.5.xml:1087 apt_preferences.5.xml:544 -#: sources.list.5.xml:198 +#: apt-ftparchive.1.xml:617 apt.conf.5.xml:1104 apt_preferences.5.xml:544 +#: sources.list.5.xml:209 msgid "Examples" msgstr "" @@ -2600,10 +2601,11 @@ msgid "" "<option>-o= <replaceable>config_string</replaceable> </option> </arg> <arg> " "<option>-c= <replaceable>config_file</replaceable> </option> </arg> <arg> " "<option>-t=</option> <arg choice='plain'> <replaceable>target_release</" -"replaceable> </arg> </arg> <group choice=\"req\"> <arg " -"choice='plain'>update</arg> <arg choice='plain'>upgrade</arg> <arg " -"choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-upgrade</arg> " -"<arg choice='plain'>install <arg choice=\"plain\" rep=\"repeat" +"replaceable> </arg> </arg> <arg> <option>-a=</option> <arg choice='plain'> " +"<replaceable>default_architecture</replaceable> </arg> </arg> <group choice=" +"\"req\"> <arg choice='plain'>update</arg> <arg choice='plain'>upgrade</arg> " +"<arg choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-upgrade</" +"arg> <arg choice='plain'>install <arg choice=\"plain\" rep=\"repeat" "\"><replaceable>pkg</replaceable> <arg> <group choice='req'> <arg " "choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> <arg " "choice='plain'> /<replaceable>target_release</replaceable> </arg> </group> </" @@ -2625,7 +2627,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:115 +#: apt-get.8.xml:122 msgid "" "<command>apt-get</command> is the command-line tool for handling packages, " "and may be considered the user's \"back-end\" to other tools using the APT " @@ -2634,13 +2636,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:124 apt-key.8.xml:127 +#: apt-get.8.xml:131 apt-key.8.xml:127 #, fuzzy msgid "update" msgstr "upgrade" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:125 +#: apt-get.8.xml:132 msgid "" "<literal>update</literal> is used to resynchronize the package index files " "from their sources. The indexes of available packages are fetched from the " @@ -2654,13 +2656,13 @@ msgid "" msgstr "" #. type: <tag></tag> -#: apt-get.8.xml:136 guide.sgml:121 +#: apt-get.8.xml:143 guide.sgml:121 #, fuzzy msgid "upgrade" msgstr "upgrade" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:137 +#: apt-get.8.xml:144 msgid "" "<literal>upgrade</literal> is used to install the newest versions of all " "packages currently installed on the system from the sources enumerated in " @@ -2675,13 +2677,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:149 +#: apt-get.8.xml:156 #, fuzzy msgid "dselect-upgrade" msgstr "dist-upgrade" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:150 +#: apt-get.8.xml:157 msgid "" "<literal>dselect-upgrade</literal> is used in conjunction with the " "traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</" @@ -2692,13 +2694,13 @@ msgid "" msgstr "" #. type: <tag></tag> -#: apt-get.8.xml:159 guide.sgml:140 +#: apt-get.8.xml:166 guide.sgml:140 #, fuzzy msgid "dist-upgrade" msgstr "dist-upgrade" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:160 +#: apt-get.8.xml:167 msgid "" "<literal>dist-upgrade</literal> in addition to performing the function of " "<literal>upgrade</literal>, also intelligently handles changing dependencies " @@ -2712,13 +2714,13 @@ msgid "" msgstr "" #. type: <tag></tag> -#: apt-get.8.xml:172 guide.sgml:131 +#: apt-get.8.xml:179 guide.sgml:131 #, fuzzy msgid "install" msgstr "install" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:174 +#: apt-get.8.xml:181 msgid "" "<literal>install</literal> is followed by one or more packages desired for " "installation or upgrading. Each package is a package name, not a fully " @@ -2734,7 +2736,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:192 +#: apt-get.8.xml:199 msgid "" "A specific version of a package can be selected for installation by " "following the package name with an equals and the version of the package to " @@ -2745,14 +2747,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:199 +#: apt-get.8.xml:206 msgid "" "Both of the version selection mechanisms can downgrade packages and must be " "used with care." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:202 +#: apt-get.8.xml:209 msgid "" "This is also the target to use if you want to upgrade one or more already-" "installed packages without upgrading every package you have on your system. " @@ -2764,14 +2766,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:213 +#: apt-get.8.xml:220 msgid "" "Finally, the &apt-preferences; mechanism allows you to create an alternative " "installation policy for individual packages." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:217 +#: apt-get.8.xml:224 msgid "" "If no package matches the given expression and the expression contains one " "of '.', '?' or '*' then it is assumed to be a POSIX regular expression, and " @@ -2783,12 +2785,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:226 +#: apt-get.8.xml:233 msgid "remove" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:227 +#: apt-get.8.xml:234 msgid "" "<literal>remove</literal> is identical to <literal>install</literal> except " "that packages are removed instead of installed. Note the removing a package " @@ -2798,12 +2800,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:234 +#: apt-get.8.xml:241 msgid "purge" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:235 +#: apt-get.8.xml:242 msgid "" "<literal>purge</literal> is identical to <literal>remove</literal> except " "that packages are removed and purged (any configuration files are deleted " @@ -2811,12 +2813,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:239 +#: apt-get.8.xml:246 msgid "source" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:240 +#: apt-get.8.xml:247 msgid "" "<literal>source</literal> causes <command>apt-get</command> to fetch source " "packages. APT will examine the available packages to decide which source " @@ -2828,7 +2830,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:248 +#: apt-get.8.xml:255 msgid "" "Source packages are tracked separately from binary packages via <literal>deb-" "src</literal> type lines in the &sources-list; file. This means that you " @@ -2838,16 +2840,17 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:255 +#: apt-get.8.xml:262 msgid "" "If the <option>--compile</option> option is specified then the package will " -"be compiled to a binary .deb using <command>dpkg-buildpackage</command>, if " -"<option>--download-only</option> is specified then the source package will " -"not be unpacked." +"be compiled to a binary .deb using <command>dpkg-buildpackage</command> for " +"the architecture as defined by the <command>--host-architecture</command> " +"option. If <option>--download-only</option> is specified then the source " +"package will not be unpacked." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:260 +#: apt-get.8.xml:269 msgid "" "A specific source version can be retrieved by postfixing the source name " "with an equals and then the version to fetch, similar to the mechanism used " @@ -2857,7 +2860,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:266 +#: apt-get.8.xml:275 msgid "" "Note that source packages are not tracked like binary packages, they exist " "only in the current directory and are similar to downloading source tar " @@ -2865,43 +2868,46 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:271 +#: apt-get.8.xml:280 msgid "build-dep" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:272 +#: apt-get.8.xml:281 msgid "" "<literal>build-dep</literal> causes apt-get to install/remove packages in an " -"attempt to satisfy the build dependencies for a source package." +"attempt to satisfy the build dependencies for a source package. By default " +"the dependencies are satisfied to build the package natively. If desired a " +"host-architecture can be specified with the <option>--host-architecture</" +"option> option instead." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:276 +#: apt-get.8.xml:287 msgid "check" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:277 +#: apt-get.8.xml:288 msgid "" "<literal>check</literal> is a diagnostic tool; it updates the package cache " "and checks for broken dependencies." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:281 +#: apt-get.8.xml:292 msgid "download" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:282 +#: apt-get.8.xml:293 msgid "" "<literal>download</literal> will download the given binary package into the " "current directory." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:288 +#: apt-get.8.xml:299 msgid "" "<literal>clean</literal> clears out the local repository of retrieved " "package files. It removes everything but the lock file from " @@ -2913,12 +2919,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:297 +#: apt-get.8.xml:308 msgid "autoclean" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:298 +#: apt-get.8.xml:309 msgid "" "Like <literal>clean</literal>, <literal>autoclean</literal> clears out the " "local repository of retrieved package files. The difference is that it only " @@ -2930,25 +2936,25 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:307 +#: apt-get.8.xml:318 msgid "autoremove" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:308 +#: apt-get.8.xml:319 msgid "" "<literal>autoremove</literal> is used to remove packages that were " -"automatically installed to satisfy dependencies for some package and that " -"are no more needed." +"automatically installed to satisfy dependencies for other packages and are " +"now no longer needed." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:312 +#: apt-get.8.xml:323 msgid "changelog" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:313 +#: apt-get.8.xml:324 msgid "" "<literal>changelog</literal> downloads a package changelog and displays it " "through <command>sensible-pager</command>. The server name and base " @@ -2961,48 +2967,48 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:335 +#: apt-get.8.xml:346 msgid "<option>--no-install-recommends</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:336 +#: apt-get.8.xml:347 msgid "" "Do not consider recommended packages as a dependency for installing. " "Configuration Item: <literal>APT::Install-Recommends</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:340 +#: apt-get.8.xml:351 msgid "<option>--install-suggests</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:341 +#: apt-get.8.xml:352 msgid "" "Consider suggested packages as a dependency for installing. Configuration " "Item: <literal>APT::Install-Suggests</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:345 +#: apt-get.8.xml:356 msgid "<option>--download-only</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:346 +#: apt-get.8.xml:357 msgid "" "Download only; package files are only retrieved, not unpacked or installed. " "Configuration Item: <literal>APT::Get::Download-Only</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:350 +#: apt-get.8.xml:361 msgid "<option>--fix-broken</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:351 +#: apt-get.8.xml:362 msgid "" "Fix; attempt to correct a system with broken dependencies in place. This " "option, when used with install/remove, can omit any packages to permit APT " @@ -3018,17 +3024,17 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:364 +#: apt-get.8.xml:375 msgid "<option>--ignore-missing</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:365 +#: apt-get.8.xml:376 msgid "<option>--fix-missing</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:366 +#: apt-get.8.xml:377 msgid "" "Ignore missing packages; If packages cannot be retrieved or fail the " "integrity check after retrieval (corrupted package files), hold back those " @@ -3040,12 +3046,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:376 +#: apt-get.8.xml:387 msgid "<option>--no-download</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:377 +#: apt-get.8.xml:388 msgid "" "Disables downloading of packages. This is best used with <option>--ignore-" "missing</option> to force APT to use only the .debs it has already " @@ -3053,7 +3059,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:384 +#: apt-get.8.xml:395 msgid "" "Quiet; produces output suitable for logging, omitting progress indicators. " "More q's will produce more quiet up to a maximum of 2. You can also use " @@ -3065,17 +3071,17 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:394 +#: apt-get.8.xml:405 msgid "<option>--simulate</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:396 +#: apt-get.8.xml:407 msgid "<option>--dry-run</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:399 +#: apt-get.8.xml:410 msgid "" "No action; perform a simulation of events that would occur but do not " "actually change the system. Configuration Item: <literal>APT::Get::" @@ -3083,7 +3089,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:403 +#: apt-get.8.xml:414 msgid "" "Simulation run as user will deactivate locking (<literal>Debug::NoLocking</" "literal>) automatic. Also a notice will be displayed indicating that this " @@ -3094,7 +3100,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:409 +#: apt-get.8.xml:420 msgid "" "Simulate prints out a series of lines each one representing a dpkg " "operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square brackets " @@ -3103,22 +3109,22 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:416 +#: apt-get.8.xml:427 msgid "<option>-y</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:416 +#: apt-get.8.xml:427 msgid "<option>--yes</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:417 +#: apt-get.8.xml:428 msgid "<option>--assume-yes</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:418 +#: apt-get.8.xml:429 msgid "" "Automatic yes to prompts; assume \"yes\" as answer to all prompts and run " "non-interactively. If an undesirable situation, such as changing a held " @@ -3128,68 +3134,84 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:425 +#: apt-get.8.xml:436 msgid "<option>-u</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:425 +#: apt-get.8.xml:436 msgid "<option>--show-upgraded</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:426 +#: apt-get.8.xml:437 msgid "" "Show upgraded packages; Print out a list of all packages that are to be " "upgraded. Configuration Item: <literal>APT::Get::Show-Upgraded</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:431 +#: apt-get.8.xml:442 msgid "<option>-V</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:431 +#: apt-get.8.xml:442 msgid "<option>--verbose-versions</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:432 +#: apt-get.8.xml:443 msgid "" "Show full versions for upgraded and installed packages. Configuration Item: " "<literal>APT::Get::Show-Versions</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:436 +#: apt-get.8.xml:448 +msgid "<option>--host-architecture</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:449 +msgid "" +"This option controls the architecture packages are built for by <command>apt-" +"get source --compile</command> and how cross-builddependencies are " +"satisfied. By default is it not set which means that the host architecture " +"is the same as the build architecture (which is defined by <literal>APT::" +"Architecture</literal>). Configuration Item: <literal>APT::Get::Host-" +"Architecture</literal>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:457 msgid "<option>-b</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:436 +#: apt-get.8.xml:457 msgid "<option>--compile</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:437 +#: apt-get.8.xml:458 msgid "<option>--build</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:438 +#: apt-get.8.xml:459 msgid "" "Compile source packages after downloading them. Configuration Item: " "<literal>APT::Get::Compile</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:442 +#: apt-get.8.xml:463 msgid "<option>--ignore-hold</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:443 +#: apt-get.8.xml:464 msgid "" "Ignore package Holds; This causes <command>apt-get</command> to ignore a " "hold placed on a package. This may be useful in conjunction with " @@ -3198,12 +3220,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:449 +#: apt-get.8.xml:470 msgid "<option>--no-upgrade</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:450 +#: apt-get.8.xml:471 msgid "" "Do not upgrade packages; When used in conjunction with <literal>install</" "literal>, <literal>no-upgrade</literal> will prevent packages on the command " @@ -3212,12 +3234,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:456 +#: apt-get.8.xml:477 msgid "<option>--only-upgrade</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:457 +#: apt-get.8.xml:478 msgid "" "Do not install new packages; When used in conjunction with <literal>install</" "literal>, <literal>only-upgrade</literal> will prevent packages on the " @@ -3226,12 +3248,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:463 +#: apt-get.8.xml:484 msgid "<option>--force-yes</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:464 +#: apt-get.8.xml:485 msgid "" "Force yes; This is a dangerous option that will cause apt to continue " "without prompting if it is doing something potentially harmful. It should " @@ -3241,12 +3263,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:471 +#: apt-get.8.xml:492 msgid "<option>--print-uris</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:472 +#: apt-get.8.xml:493 msgid "" "Instead of fetching the files to install their URIs are printed. Each URI " "will have the path, the destination file name, the size and the expected md5 " @@ -3259,12 +3281,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:482 +#: apt-get.8.xml:503 msgid "<option>--purge</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:483 +#: apt-get.8.xml:504 msgid "" "Use purge instead of remove for anything that would be removed. An asterisk " "(\"*\") will be displayed next to packages which are scheduled to be purged. " @@ -3273,24 +3295,24 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:490 +#: apt-get.8.xml:511 msgid "<option>--reinstall</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:491 +#: apt-get.8.xml:512 msgid "" "Re-Install packages that are already installed and at the newest version. " "Configuration Item: <literal>APT::Get::ReInstall</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:495 +#: apt-get.8.xml:516 msgid "<option>--list-cleanup</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:496 +#: apt-get.8.xml:517 msgid "" "This option defaults to on, use <literal>--no-list-cleanup</literal> to turn " "it off. When on <command>apt-get</command> will automatically manage the " @@ -3301,17 +3323,17 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:505 +#: apt-get.8.xml:526 msgid "<option>--target-release</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:506 +#: apt-get.8.xml:527 msgid "<option>--default-release</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:507 +#: apt-get.8.xml:528 msgid "" "This option controls the default input to the policy engine, it creates a " "default pin at priority 990 using the specified release string. This " @@ -3325,12 +3347,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:520 +#: apt-get.8.xml:541 msgid "<option>--trivial-only</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:522 +#: apt-get.8.xml:543 msgid "" "Only perform operations that are 'trivial'. Logically this can be considered " "related to <option>--assume-yes</option>, where <option>--assume-yes</" @@ -3339,24 +3361,24 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:528 +#: apt-get.8.xml:549 msgid "<option>--no-remove</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:529 +#: apt-get.8.xml:550 msgid "" "If any packages are to be removed apt-get immediately aborts without " "prompting. Configuration Item: <literal>APT::Get::Remove</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:534 +#: apt-get.8.xml:555 msgid "<option>--auto-remove</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:535 +#: apt-get.8.xml:556 msgid "" "If the command is either <literal>install</literal> or <literal>remove</" "literal>, then this option acts like running <literal>autoremove</literal> " @@ -3365,12 +3387,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:541 +#: apt-get.8.xml:562 msgid "<option>--only-source</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:542 +#: apt-get.8.xml:563 msgid "" "Only has meaning for the <literal>source</literal> and <literal>build-dep</" "literal> commands. Indicates that the given source names are not to be " @@ -3382,22 +3404,22 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:552 +#: apt-get.8.xml:573 msgid "<option>--diff-only</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:552 +#: apt-get.8.xml:573 msgid "<option>--dsc-only</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:552 +#: apt-get.8.xml:573 msgid "<option>--tar-only</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:553 +#: apt-get.8.xml:574 msgid "" "Download only the diff, dsc, or tar file of a source archive. Configuration " "Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</" @@ -3405,24 +3427,24 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:558 +#: apt-get.8.xml:579 msgid "<option>--arch-only</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:559 +#: apt-get.8.xml:580 msgid "" "Only process architecture-dependent build-dependencies. Configuration Item: " "<literal>APT::Get::Arch-Only</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:563 +#: apt-get.8.xml:584 msgid "<option>--allow-unauthenticated</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:564 +#: apt-get.8.xml:585 msgid "" "Ignore if packages can't be authenticated and don't prompt about it. This " "is useful for tools like pbuilder. Configuration Item: <literal>APT::Get::" @@ -3430,14 +3452,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist> -#: apt-get.8.xml:577 +#: apt-get.8.xml:598 msgid "" "&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; " "&file-statelists;" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:586 +#: apt-get.8.xml:607 msgid "" "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, " "&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-" @@ -3445,29 +3467,29 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:592 +#: apt-get.8.xml:613 msgid "" "<command>apt-get</command> returns zero on normal operation, decimal 100 on " "error." msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:595 +#: apt-get.8.xml:616 msgid "ORIGINAL AUTHORS" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:596 +#: apt-get.8.xml:617 msgid "&apt-author.jgunthorpe;" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:599 +#: apt-get.8.xml:620 msgid "CURRENT AUTHORS" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:601 +#: apt-get.8.xml:622 msgid "&apt-author.team;" msgstr "" @@ -3582,86 +3604,91 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:131 msgid "" -"Update the local keyring with the keyring of Debian archive keys and removes " -"from the keyring the archive keys which are no longer valid." +"Update the local keyring with the archive keyring and remove from the local " +"keyring the archive keys which are no longer valid. The archive keyring is " +"shipped in the <literal>archive-keyring</literal> package of your " +"distribution, e.g. the <literal>debian-archive-keyring</literal> package in " +"Debian." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:140 +#: apt-key.8.xml:141 #, fuzzy msgid "net-update" msgstr "upgrade" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:144 +#: apt-key.8.xml:145 msgid "" -"Update the local keyring with the keys of a key server and removes from the " -"keyring the archive keys which are no longer valid. This requires an " -"installed wget and an APT build configured to have a server to fetch from. " -"APT in Debian does not support this command, but Ubuntu's APT does." +"Work similar to the <command>update</command> command above, but get the " +"archive keyring from an URI instead and validate it against a master key. " +"This requires an installed &wget; and an APT build configured to have a " +"server to fetch from and a master keyring to validate. APT in Debian does " +"not support this command and relies on <command>update</command> instead, " +"but Ubuntu's APT does." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-key.8.xml:159 +#: apt-key.8.xml:162 msgid "" "Note that options need to be defined before the commands described in the " "previous section." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:161 +#: apt-key.8.xml:164 msgid "--keyring <replaceable>filename</replaceable>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:162 +#: apt-key.8.xml:165 msgid "" "With this option it is possible to specify a specific keyring file the " "command should operate on. The default is that a command is executed on the " "<filename>trusted.gpg</filename> file as well as on all parts in the " -"<filename>trusted.gpg.d</filename> directory, through <filename>trusted.gpg</" +"<filename>trusted.gpg.d</filename> directory, though <filename>trusted.gpg</" "filename> is the primary keyring which means that e.g. new keys are added to " "this one." msgstr "" #. type: Content of: <refentry><refsect1><variablelist> -#: apt-key.8.xml:175 +#: apt-key.8.xml:178 msgid "&file-trustedgpg;" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:177 +#: apt-key.8.xml:180 msgid "<filename>/etc/apt/trustdb.gpg</filename>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:178 +#: apt-key.8.xml:181 msgid "Local trust database of archive keys." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:181 +#: apt-key.8.xml:184 msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:182 +#: apt-key.8.xml:185 msgid "Keyring of Debian archive trusted keys." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:185 +#: apt-key.8.xml:188 msgid "" "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:186 +#: apt-key.8.xml:189 msgid "Keyring of Debian archive removed trusted keys." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-key.8.xml:195 +#: apt-key.8.xml:198 msgid "&apt-get;, &apt-secure;" msgstr "" @@ -4351,13 +4378,24 @@ msgid "" "compiled for." msgstr "" +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:158 +msgid "" +"All Architectures the system supports. Processors implementing the " +"<literal>amd64</literal> are e.g. also able to execute binaries compiled for " +"<literal>i386</literal>; This list is use when fetching files and parsing " +"package lists. The internal default is always the native architecture " +"(<literal>APT::Architecture</literal>) and all foreign architectures it can " +"retrieve by calling <command>dpkg --print-foreign-architectures</command>." +msgstr "" + #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:157 +#: apt.conf.5.xml:165 msgid "Default-Release" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:158 +#: apt.conf.5.xml:166 msgid "" "Default release to install packages from if more than one version available. " "Contains release name, codename or release version. Examples: 'stable', " @@ -4366,24 +4404,24 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:163 +#: apt.conf.5.xml:171 msgid "Ignore-Hold" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:164 +#: apt.conf.5.xml:172 msgid "" "Ignore Held packages; This global option causes the problem resolver to " "ignore held packages in its decision making." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:168 +#: apt.conf.5.xml:176 msgid "Clean-Installed" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:169 +#: apt.conf.5.xml:177 msgid "" "Defaults to on. When turned on the autoclean feature will remove any " "packages which can no longer be downloaded from the cache. If turned off " @@ -4392,12 +4430,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:175 +#: apt.conf.5.xml:183 msgid "Immediate-Configure" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:176 +#: apt.conf.5.xml:184 msgid "" "Defaults to on which will cause APT to install essential and important " "packages as fast as possible in the install/upgrade operation. This is done " @@ -4430,12 +4468,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:198 +#: apt.conf.5.xml:206 msgid "Force-LoopBreak" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:199 +#: apt.conf.5.xml:207 msgid "" "Never Enable this option unless you -really- know what you are doing. It " "permits APT to temporarily remove an essential package to break a Conflicts/" @@ -4446,12 +4484,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:207 +#: apt.conf.5.xml:215 msgid "Cache-Start, Cache-Grow and Cache-Limit" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:208 +#: apt.conf.5.xml:216 msgid "" "APT uses since version 0.7.26 a resizable memory mapped cache file to store " "the 'available' information. <literal>Cache-Start</literal> acts as a hint " @@ -4471,63 +4509,63 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:223 +#: apt.conf.5.xml:231 msgid "Build-Essential" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:224 +#: apt.conf.5.xml:232 msgid "Defines which package(s) are considered essential build dependencies." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:227 +#: apt.conf.5.xml:235 msgid "Get" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:228 +#: apt.conf.5.xml:236 msgid "" "The Get subsection controls the &apt-get; tool, please see its documentation " "for more information about the options here." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:232 +#: apt.conf.5.xml:240 msgid "Cache" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:233 +#: apt.conf.5.xml:241 msgid "" "The Cache subsection controls the &apt-cache; tool, please see its " "documentation for more information about the options here." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:237 +#: apt.conf.5.xml:245 msgid "CDROM" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:238 +#: apt.conf.5.xml:246 msgid "" "The CDROM subsection controls the &apt-cdrom; tool, please see its " "documentation for more information about the options here." msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:244 +#: apt.conf.5.xml:252 msgid "The Acquire Group" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:249 +#: apt.conf.5.xml:257 msgid "Check-Valid-Until" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:250 +#: apt.conf.5.xml:258 msgid "" "Security related option defaulting to true as an expiring validation for a " "Release file prevents longtime replay attacks and can e.g. also help users " @@ -4539,38 +4577,51 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:260 +#: apt.conf.5.xml:268 msgid "Max-ValidTime" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:261 +#: apt.conf.5.xml:269 +msgid "" +"Seconds the Release file should be considered valid after it was created " +"(indicated by the <literal>Date</literal> header). If the Release file " +"itself includes a <literal>Valid-Until</literal> header the earlier date of " +"the two is used as the expiration date. The default value is <literal>0</" +"literal> which stands for \"for ever\". Archive specific settings can be " +"made by appending the label of the archive to the option name." +msgstr "" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: apt.conf.5.xml:279 +msgid "Min-ValidTime" +msgstr "" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:280 msgid "" -"Seconds the Release file should be considered valid after it was created. " -"The default is \"for ever\" (0) if the Release file of the archive doesn't " -"include a <literal>Valid-Until</literal> header. If it does then this date " -"is the default. The date from the Release file or the date specified by the " -"creation time of the Release file (<literal>Date</literal> header) plus the " -"seconds specified with this options are used to check if the validation of a " -"file has expired by using the earlier date of the two. Archive specific " -"settings can be made by appending the label of the archive to the option " -"name." +"Minimum of seconds the Release file should be considered valid after it was " +"created (indicated by the <literal>Date</literal> header). Use this if you " +"need to use a seldomly updated (local) mirror of a more regular updated " +"archive with a <literal>Valid-Until</literal> header instead of completely " +"disabling the expiration date checking. Archive specific settings can and " +"should be used by appending the label of the archive to the option name." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:273 +#: apt.conf.5.xml:290 msgid "PDiffs" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:274 +#: apt.conf.5.xml:291 msgid "" "Try to download deltas called <literal>PDiffs</literal> for Packages or " "Sources files instead of downloading whole ones. True by default." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:277 +#: apt.conf.5.xml:294 msgid "" "Two sub-options to limit the use of PDiffs are also available: With " "<literal>FileLimit</literal> can be specified how many PDiff files are " @@ -4581,12 +4632,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:286 +#: apt.conf.5.xml:303 msgid "Queue-Mode" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:287 +#: apt.conf.5.xml:304 msgid "" "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</" "literal> or <literal>access</literal> which determines how APT parallelizes " @@ -4596,36 +4647,36 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:294 +#: apt.conf.5.xml:311 msgid "Retries" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:295 +#: apt.conf.5.xml:312 msgid "" "Number of retries to perform. If this is non-zero APT will retry failed " "files the given number of times." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:299 +#: apt.conf.5.xml:316 msgid "Source-Symlinks" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:300 +#: apt.conf.5.xml:317 msgid "" "Use symlinks for source archives. If set to true then source archives will " "be symlinked when possible instead of copying. True is the default." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:304 sources.list.5.xml:144 +#: apt.conf.5.xml:321 sources.list.5.xml:155 msgid "http" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:305 +#: apt.conf.5.xml:322 msgid "" "HTTP URIs; http::Proxy is the default http proxy to use. It is in the " "standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per " @@ -4636,7 +4687,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:313 +#: apt.conf.5.xml:330 msgid "" "Three settings are provided for cache control with HTTP/1.1 compliant proxy " "caches. <literal>No-Cache</literal> tells the proxy to not use its cached " @@ -4650,7 +4701,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:323 apt.conf.5.xml:387 +#: apt.conf.5.xml:340 apt.conf.5.xml:404 msgid "" "The option <literal>timeout</literal> sets the timeout timer used by the " "method, this applies to all things including connection timeout and data " @@ -4658,7 +4709,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:326 +#: apt.conf.5.xml:343 msgid "" "One setting is provided to control the pipeline depth in cases where the " "remote server is not RFC conforming or buggy (such as Squid 2.0.2). " @@ -4670,7 +4721,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:334 +#: apt.conf.5.xml:351 msgid "" "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</" "literal> which accepts integer values in kilobyte. The default value is 0 " @@ -4680,7 +4731,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:339 +#: apt.conf.5.xml:356 msgid "" "<literal>Acquire::http::User-Agent</literal> can be used to set a different " "User-Agent for the http download method as some proxies allow access for " @@ -4688,12 +4739,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:345 +#: apt.conf.5.xml:362 msgid "https" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:346 +#: apt.conf.5.xml:363 msgid "" "HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy " "options are the same as for <literal>http</literal> method and will also " @@ -4703,7 +4754,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:352 +#: apt.conf.5.xml:369 msgid "" "<literal>CaInfo</literal> suboption specifies place of file that holds info " "about trusted certificates. <literal><host>::CaInfo</literal> is " @@ -4724,12 +4775,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:370 sources.list.5.xml:155 +#: apt.conf.5.xml:387 sources.list.5.xml:166 msgid "ftp" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:371 +#: apt.conf.5.xml:388 msgid "" "FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard " "form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host " @@ -4748,7 +4799,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:390 +#: apt.conf.5.xml:407 msgid "" "Several settings are provided to control passive mode. Generally it is safe " "to leave passive mode on, it works in nearly every environment. However " @@ -4758,7 +4809,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:397 +#: apt.conf.5.xml:414 msgid "" "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</" "envar> environment variable to a http url - see the discussion of the http " @@ -4767,7 +4818,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:402 +#: apt.conf.5.xml:419 msgid "" "The setting <literal>ForceExtended</literal> controls the use of RFC2428 " "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is " @@ -4777,18 +4828,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:409 sources.list.5.xml:137 +#: apt.conf.5.xml:426 sources.list.5.xml:148 msgid "cdrom" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:415 +#: apt.conf.5.xml:432 #, no-wrap msgid "/cdrom/::Mount \"foo\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:410 +#: apt.conf.5.xml:427 msgid "" "CDROM URIs; the only setting for CDROM URIs is the mount point, " "<literal>cdrom::Mount</literal> which must be the mount point for the CDROM " @@ -4801,12 +4852,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:420 +#: apt.conf.5.xml:437 msgid "gpgv" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:421 +#: apt.conf.5.xml:438 msgid "" "GPGV URIs; the only option for GPGV URIs is the option to pass additional " "parameters to gpgv. <literal>gpgv::Options</literal> Additional options " @@ -4814,18 +4865,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:426 +#: apt.conf.5.xml:443 msgid "CompressionTypes" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:432 +#: apt.conf.5.xml:449 #, no-wrap msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:427 +#: apt.conf.5.xml:444 msgid "" "List of compression types which are understood by the acquire methods. " "Files like <filename>Packages</filename> can be available in various " @@ -4837,19 +4888,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:437 +#: apt.conf.5.xml:454 #, no-wrap msgid "Acquire::CompressionTypes::Order:: \"gz\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:440 +#: apt.conf.5.xml:457 #, no-wrap msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:433 +#: apt.conf.5.xml:450 msgid "" "Also the <literal>Order</literal> subgroup can be used to define in which " "order the acquire system will try to download the compressed files. The " @@ -4866,13 +4917,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:444 +#: apt.conf.5.xml:461 #, no-wrap msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:442 +#: apt.conf.5.xml:459 msgid "" "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</" "replaceable></literal> will be checked: If this setting exists the method " @@ -4887,7 +4938,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:449 +#: apt.conf.5.xml:466 msgid "" "The special type <literal>uncompressed</literal> can be used to give " "uncompressed files a preference, but note that most archives don't provide " @@ -4895,12 +4946,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:454 +#: apt.conf.5.xml:471 msgid "GzipIndexes" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:456 +#: apt.conf.5.xml:473 msgid "" "When downloading <literal>gzip</literal> compressed indexes (Packages, " "Sources, or Translations), keep them gzip compressed locally instead of " @@ -4909,12 +4960,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:463 +#: apt.conf.5.xml:480 msgid "Languages" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:464 +#: apt.conf.5.xml:481 msgid "" "The Languages subsection controls which <filename>Translation</filename> " "files are downloaded and in which order APT tries to display the Description-" @@ -4927,13 +4978,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting> -#: apt.conf.5.xml:480 +#: apt.conf.5.xml:497 #, no-wrap msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:470 +#: apt.conf.5.xml:487 msgid "" "The default list includes \"environment\" and \"en\". " "\"<literal>environment</literal>\" has a special meaning here: It will be " @@ -4956,19 +5007,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:245 +#: apt.conf.5.xml:253 msgid "" "The <literal>Acquire</literal> group of options controls the download of " "packages and the URI handlers. <placeholder type=\"variablelist\" id=\"0\"/>" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:487 +#: apt.conf.5.xml:504 msgid "Directories" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:489 +#: apt.conf.5.xml:506 msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " "local state information. <literal>lists</literal> is the directory to place " @@ -4980,7 +5031,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:496 +#: apt.conf.5.xml:513 msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " "information, such as the two package caches <literal>srcpkgcache</literal> " @@ -4993,7 +5044,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:505 +#: apt.conf.5.xml:522 msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " "<literal>sourcelist</literal> gives the location of the sourcelist and " @@ -5003,7 +5054,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:511 +#: apt.conf.5.xml:528 msgid "" "The <literal>Dir::Parts</literal> setting reads in all the config fragments " "in lexical order from the directory specified. After this is done then the " @@ -5011,7 +5062,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:515 +#: apt.conf.5.xml:532 msgid "" "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::" "Bin::Methods</literal> specifies the location of the method handlers and " @@ -5022,7 +5073,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:523 +#: apt.conf.5.xml:540 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@ -5035,7 +5086,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:536 +#: apt.conf.5.xml:553 msgid "" "The <literal>Ignore-Files-Silently</literal> list can be used to specify " "which files APT should silently ignore while parsing the files in the " @@ -5046,13 +5097,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:545 +#: apt.conf.5.xml:562 #, fuzzy msgid "APT in DSelect" msgstr "DSelect" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:547 +#: apt.conf.5.xml:564 msgid "" "When APT is used as a &dselect; method several configuration directives " "control the default behaviour. These are in the <literal>DSelect</literal> " @@ -5060,12 +5111,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:551 +#: apt.conf.5.xml:568 msgid "Clean" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:552 +#: apt.conf.5.xml:569 msgid "" "Cache Clean mode; this value may be one of always, prompt, auto, pre-auto " "and never. always and prompt will remove all packages from the cache after " @@ -5076,50 +5127,50 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:561 +#: apt.conf.5.xml:578 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the install phase." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:565 +#: apt.conf.5.xml:582 msgid "Updateoptions" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:566 +#: apt.conf.5.xml:583 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the update phase." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:570 +#: apt.conf.5.xml:587 msgid "PromptAfterUpdate" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:571 +#: apt.conf.5.xml:588 msgid "" "If true the [U]pdate operation in &dselect; will always prompt to continue. " "The default is to prompt only on error." msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:577 +#: apt.conf.5.xml:594 msgid "How APT calls dpkg" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:578 +#: apt.conf.5.xml:595 msgid "" "Several configuration directives control how APT invokes &dpkg;. These are " "in the <literal>DPkg</literal> section." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:583 +#: apt.conf.5.xml:600 msgid "" "This is a list of options to pass to dpkg. The options must be specified " "using the list notation and each list item is passed as a single argument to " @@ -5127,17 +5178,17 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:588 +#: apt.conf.5.xml:605 msgid "Pre-Invoke" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:588 +#: apt.conf.5.xml:605 msgid "Post-Invoke" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:589 +#: apt.conf.5.xml:606 msgid "" "This is a list of shell commands to run before/after invoking &dpkg;. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -5146,12 +5197,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:595 +#: apt.conf.5.xml:612 msgid "Pre-Install-Pkgs" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:596 +#: apt.conf.5.xml:613 msgid "" "This is a list of shell commands to run before invoking dpkg. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -5161,7 +5212,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:602 +#: apt.conf.5.xml:619 msgid "" "Version 2 of this protocol dumps more information, including the protocol " "version, the APT configuration space and the packages, files and versions " @@ -5171,36 +5222,36 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:609 +#: apt.conf.5.xml:626 msgid "Run-Directory" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:610 +#: apt.conf.5.xml:627 msgid "" "APT chdirs to this directory before invoking dpkg, the default is <filename>/" "</filename>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:614 +#: apt.conf.5.xml:631 msgid "Build-options" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:615 +#: apt.conf.5.xml:632 msgid "" "These options are passed to &dpkg-buildpackage; when compiling packages, the " "default is to disable signing and produce all binaries." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt.conf.5.xml:620 +#: apt.conf.5.xml:637 msgid "dpkg trigger usage (and related options)" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:621 +#: apt.conf.5.xml:638 msgid "" "APT can call dpkg in a way so it can make aggressive use of triggers over " "multiple calls of dpkg. Without further options dpkg will use triggers only " @@ -5215,7 +5266,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> -#: apt.conf.5.xml:636 +#: apt.conf.5.xml:653 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@ -5225,7 +5276,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:630 +#: apt.conf.5.xml:647 msgid "" "Note that it is not guaranteed that APT will support these options or that " "these options will not cause (big) trouble in the future. If you have " @@ -5239,12 +5290,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:642 +#: apt.conf.5.xml:659 msgid "DPkg::NoTriggers" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:643 +#: apt.conf.5.xml:660 msgid "" "Add the no triggers flag to all dpkg calls (except the ConfigurePending " "call). See &dpkg; if you are interested in what this actually means. In " @@ -5256,12 +5307,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:650 +#: apt.conf.5.xml:667 msgid "PackageManager::Configure" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:651 +#: apt.conf.5.xml:668 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default " @@ -5277,12 +5328,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:661 +#: apt.conf.5.xml:678 msgid "DPkg::ConfigurePending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:662 +#: apt.conf.5.xml:679 msgid "" "If this option is set apt will call <command>dpkg --configure --pending</" "command> to let dpkg handle all required configurations and triggers. This " @@ -5293,12 +5344,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:668 +#: apt.conf.5.xml:685 msgid "DPkg::TriggersPending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:669 +#: apt.conf.5.xml:686 msgid "" "Useful for <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal> and dpkg " @@ -5308,12 +5359,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:674 +#: apt.conf.5.xml:691 msgid "PackageManager::UnpackAll" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:675 +#: apt.conf.5.xml:692 msgid "" "As the configuration can be deferred to be done at the end by dpkg it can be " "tried to order the unpack series only by critical needs, e.g. by Pre-" @@ -5325,12 +5376,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:682 +#: apt.conf.5.xml:699 msgid "OrderList::Score::Immediate" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:690 +#: apt.conf.5.xml:707 #, no-wrap msgid "" "OrderList::Score {\n" @@ -5342,7 +5393,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:683 +#: apt.conf.5.xml:700 msgid "" "Essential packages (and there dependencies) should be configured immediately " "after unpacking. It will be a good idea to do this quite early in the " @@ -5356,12 +5407,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:703 +#: apt.conf.5.xml:720 msgid "Periodic and Archives options" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:704 +#: apt.conf.5.xml:721 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by " @@ -5370,12 +5421,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:712 +#: apt.conf.5.xml:729 msgid "Debug options" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:714 +#: apt.conf.5.xml:731 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@ -5386,7 +5437,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:725 +#: apt.conf.5.xml:742 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</" @@ -5394,7 +5445,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:733 +#: apt.conf.5.xml:750 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s install</" @@ -5402,7 +5453,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:742 +#: apt.conf.5.xml:759 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@ -5412,111 +5463,111 @@ msgstr "" #. motivating example, except I haven't a clue why you'd want #. to do this. #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:750 +#: apt.conf.5.xml:767 msgid "" "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " "in CDROM IDs." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:760 +#: apt.conf.5.xml:777 msgid "A full list of debugging options to apt follows." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:765 +#: apt.conf.5.xml:782 msgid "<literal>Debug::Acquire::cdrom</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:769 +#: apt.conf.5.xml:786 msgid "" "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:776 +#: apt.conf.5.xml:793 msgid "<literal>Debug::Acquire::ftp</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:780 +#: apt.conf.5.xml:797 msgid "Print information related to downloading packages using FTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:787 +#: apt.conf.5.xml:804 msgid "<literal>Debug::Acquire::http</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:791 +#: apt.conf.5.xml:808 msgid "Print information related to downloading packages using HTTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:798 +#: apt.conf.5.xml:815 msgid "<literal>Debug::Acquire::https</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:802 +#: apt.conf.5.xml:819 msgid "Print information related to downloading packages using HTTPS." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:809 +#: apt.conf.5.xml:826 msgid "<literal>Debug::Acquire::gpgv</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:813 +#: apt.conf.5.xml:830 msgid "" "Print information related to verifying cryptographic signatures using " "<literal>gpg</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:820 +#: apt.conf.5.xml:837 msgid "<literal>Debug::aptcdrom</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:824 +#: apt.conf.5.xml:841 msgid "" "Output information about the process of accessing collections of packages " "stored on CD-ROMs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:831 +#: apt.conf.5.xml:848 msgid "<literal>Debug::BuildDeps</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:834 +#: apt.conf.5.xml:851 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:841 +#: apt.conf.5.xml:858 msgid "<literal>Debug::Hashes</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:844 +#: apt.conf.5.xml:861 msgid "" "Output each cryptographic hash that is generated by the <literal>apt</" "literal> libraries." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:851 +#: apt.conf.5.xml:868 msgid "<literal>Debug::IdentCDROM</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:854 +#: apt.conf.5.xml:871 msgid "" "Do not include information from <literal>statfs</literal>, namely the number " "of used and free blocks on the CD-ROM filesystem, when generating an ID for " @@ -5524,93 +5575,93 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:862 +#: apt.conf.5.xml:879 msgid "<literal>Debug::NoLocking</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:865 +#: apt.conf.5.xml:882 msgid "" "Disable all file locking. For instance, this will allow two instances of " "<quote><literal>apt-get update</literal></quote> to run at the same time." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:873 +#: apt.conf.5.xml:890 msgid "<literal>Debug::pkgAcquire</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:877 +#: apt.conf.5.xml:894 msgid "Log when items are added to or removed from the global download queue." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:884 +#: apt.conf.5.xml:901 msgid "<literal>Debug::pkgAcquire::Auth</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:887 +#: apt.conf.5.xml:904 msgid "" "Output status messages and errors related to verifying checksums and " "cryptographic signatures of downloaded files." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:894 +#: apt.conf.5.xml:911 msgid "<literal>Debug::pkgAcquire::Diffs</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:897 +#: apt.conf.5.xml:914 msgid "" "Output information about downloading and applying package index list diffs, " "and errors relating to package index list diffs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:905 +#: apt.conf.5.xml:922 msgid "<literal>Debug::pkgAcquire::RRed</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:909 +#: apt.conf.5.xml:926 msgid "" "Output information related to patching apt package lists when downloading " "index diffs instead of full indices." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:916 +#: apt.conf.5.xml:933 msgid "<literal>Debug::pkgAcquire::Worker</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:920 +#: apt.conf.5.xml:937 msgid "" "Log all interactions with the sub-processes that actually perform downloads." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:927 +#: apt.conf.5.xml:944 msgid "<literal>Debug::pkgAutoRemove</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:931 +#: apt.conf.5.xml:948 msgid "" "Log events related to the automatically-installed status of packages and to " "the removal of unused packages." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:938 +#: apt.conf.5.xml:955 msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:941 +#: apt.conf.5.xml:958 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial auto-" @@ -5620,12 +5671,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:952 +#: apt.conf.5.xml:969 msgid "<literal>Debug::pkgDepCache::Marker</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:955 +#: apt.conf.5.xml:972 msgid "" "Generate debug messages describing which package is marked as keep/install/" "remove while the ProblemResolver does his work. Each addition or deletion " @@ -5642,91 +5693,91 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:974 +#: apt.conf.5.xml:991 msgid "<literal>Debug::pkgInitConfig</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:977 +#: apt.conf.5.xml:994 msgid "Dump the default configuration to standard error on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:984 +#: apt.conf.5.xml:1001 msgid "<literal>Debug::pkgDPkgPM</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:987 +#: apt.conf.5.xml:1004 msgid "" "When invoking &dpkg;, output the precise command line with which it is being " "invoked, with arguments separated by a single space character." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:995 +#: apt.conf.5.xml:1012 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:998 +#: apt.conf.5.xml:1015 msgid "" "Output all the data received from &dpkg; on the status file descriptor and " "any errors encountered while parsing it." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1005 +#: apt.conf.5.xml:1022 msgid "<literal>Debug::pkgOrderList</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1009 +#: apt.conf.5.xml:1026 msgid "" "Generate a trace of the algorithm that decides the order in which " "<literal>apt</literal> should pass packages to &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1017 +#: apt.conf.5.xml:1034 msgid "<literal>Debug::pkgPackageManager</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1021 +#: apt.conf.5.xml:1038 msgid "" "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1028 +#: apt.conf.5.xml:1045 msgid "<literal>Debug::pkgPolicy</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1032 +#: apt.conf.5.xml:1049 msgid "Output the priority of each package list on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1038 +#: apt.conf.5.xml:1055 msgid "<literal>Debug::pkgProblemResolver</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1042 +#: apt.conf.5.xml:1059 msgid "" "Trace the execution of the dependency resolver (this applies only to what " "happens when a complex dependency problem is encountered)." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1050 +#: apt.conf.5.xml:1067 msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1053 +#: apt.conf.5.xml:1070 msgid "" "Display a list of all installed packages with their calculated score used by " "the pkgProblemResolver. The description of the package is the same as " @@ -5734,32 +5785,32 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1061 +#: apt.conf.5.xml:1078 msgid "<literal>Debug::sourceList</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1065 +#: apt.conf.5.xml:1082 msgid "" "Print information about the vendors read from <filename>/etc/apt/vendors." "list</filename>." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1088 +#: apt.conf.5.xml:1105 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." msgstr "" #. type: Content of: <refentry><refsect1><variablelist> -#: apt.conf.5.xml:1095 +#: apt.conf.5.xml:1112 msgid "&file-aptconf;" msgstr "" #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1100 +#: apt.conf.5.xml:1117 msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "" @@ -6842,7 +6893,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml:81 #, no-wrap -msgid "deb uri distribution [component1] [component2] [...]" +msgid "deb [ options ] uri distribution [component1] [component2] [...]" msgstr "" #. type: Content of: <refentry><refsect1><para> @@ -6887,6 +6938,27 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:112 msgid "" +"<literal>options</literal> is always optional and needs to be surounded by " +"square brackets. It can consist of multiple settings in the form " +"<literal><replaceable>setting</replaceable>=<replaceable>value</" +"replaceable></literal>. Multiple settings are separated by spaces. The " +"following settings are supported by APT, note though that unsupported " +"settings will be ignored silently:" +msgstr "" + +#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> +#: sources.list.5.xml:117 +msgid "" +"<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</" +"replaceable>,…</literal> can be used to specify for which architectures " +"packages information should be downloaded. If this option is not set all " +"architectures defined by the <literal>APT::Architectures</literal> option " +"will be downloaded." +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:123 +msgid "" "It is important to list sources in order of preference, with the most " "preferred source listed first. Typically this will result in sorting by " "speed from fastest to slowest (CD-ROM followed by hosts on a local network, " @@ -6894,12 +6966,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:117 +#: sources.list.5.xml:128 msgid "Some examples:" msgstr "" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:119 +#: sources.list.5.xml:130 #, no-wrap msgid "" "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n" @@ -6908,17 +6980,17 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: sources.list.5.xml:125 +#: sources.list.5.xml:136 msgid "URI specification" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: sources.list.5.xml:130 +#: sources.list.5.xml:141 msgid "file" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:132 +#: sources.list.5.xml:143 msgid "" "The file scheme allows an arbitrary directory in the file system to be " "considered an archive. This is useful for NFS mounts and local mirrors or " @@ -6926,14 +6998,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:139 +#: sources.list.5.xml:150 msgid "" "The cdrom scheme allows APT to use a local CDROM drive with media swapping. " "Use the &apt-cdrom; program to create cdrom entries in the source list." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:146 +#: sources.list.5.xml:157 msgid "" "The http scheme specifies an HTTP server for the archive. If an environment " "variable <envar>http_proxy</envar> is set with the format http://server:" @@ -6944,7 +7016,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:157 +#: sources.list.5.xml:168 msgid "" "The ftp scheme specifies an FTP server for the archive. APT's FTP behavior " "is highly configurable; for more information see the &apt-conf; manual page. " @@ -6956,12 +7028,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: sources.list.5.xml:166 +#: sources.list.5.xml:177 msgid "copy" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:168 +#: sources.list.5.xml:179 msgid "" "The copy scheme is identical to the file scheme except that packages are " "copied into the cache directory instead of used directly at their location. " @@ -6969,17 +7041,17 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: sources.list.5.xml:173 +#: sources.list.5.xml:184 msgid "rsh" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: sources.list.5.xml:173 +#: sources.list.5.xml:184 msgid "ssh" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:175 +#: sources.list.5.xml:186 msgid "" "The rsh/ssh method invokes rsh/ssh to connect to a remote host as a given " "user and access the files. It is a good idea to do prior arrangements with " @@ -6989,12 +7061,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: sources.list.5.xml:183 +#: sources.list.5.xml:194 msgid "more recognizable URI types" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:185 +#: sources.list.5.xml:196 msgid "" "APT can be extended with more methods shipped in other optional packages " "which should follow the nameing scheme <literal>apt-transport-" @@ -7007,75 +7079,91 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:127 +#: sources.list.5.xml:138 msgid "" "The currently recognized URI types are cdrom, file, http, ftp, copy, ssh, " "rsh. <placeholder type=\"variablelist\" id=\"0\"/>" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:199 +#: sources.list.5.xml:210 msgid "" "Uses the archive stored locally (or NFS mounted) at /home/jason/debian for " "stable/main, stable/contrib, and stable/non-free." msgstr "" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:201 +#: sources.list.5.xml:212 #, no-wrap msgid "deb file:/home/jason/debian stable main contrib non-free" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:203 +#: sources.list.5.xml:214 msgid "As above, except this uses the unstable (development) distribution." msgstr "" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:204 +#: sources.list.5.xml:215 #, no-wrap msgid "deb file:/home/jason/debian unstable main contrib non-free" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:206 +#: sources.list.5.xml:217 msgid "Source line for the above" msgstr "" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:207 +#: sources.list.5.xml:218 #, no-wrap msgid "deb-src file:/home/jason/debian unstable main contrib non-free" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:209 +#: sources.list.5.xml:220 +msgid "" +"The first line gets package information for the architectures in " +"<literal>APT::Architectures</literal> while the second always retrieves " +"<literal>amd64</literal> and <literal>armel</literal>." +msgstr "" + +#. type: Content of: <refentry><refsect1><literallayout> +#: sources.list.5.xml:222 +#, no-wrap +msgid "" +"deb http://ftp.debian.org/debian &stable-codename; main\n" +"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main" +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:225 msgid "" "Uses HTTP to access the archive at archive.debian.org, and uses only the " "hamm/main area." msgstr "" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:211 +#: sources.list.5.xml:227 #, no-wrap msgid "deb http://archive.debian.org/debian-archive hamm main" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:213 +#: sources.list.5.xml:229 msgid "" "Uses FTP to access the archive at ftp.debian.org, under the debian " "directory, and uses only the &stable-codename;/contrib area." msgstr "" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:215 +#: sources.list.5.xml:231 #, no-wrap msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:217 +#: sources.list.5.xml:233 msgid "" "Uses FTP to access the archive at ftp.debian.org, under the debian " "directory, and uses only the unstable/contrib area. If this line appears as " @@ -7084,19 +7172,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:221 +#: sources.list.5.xml:237 #, no-wrap msgid "deb ftp://ftp.debian.org/debian unstable contrib" msgstr "" #. type: Content of: <refentry><refsect1><para><literallayout> -#: sources.list.5.xml:230 +#: sources.list.5.xml:246 #, no-wrap msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:223 +#: sources.list.5.xml:239 msgid "" "Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe " "directory, and uses only files found under <filename>unstable/binary-i386</" @@ -7108,7 +7196,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:235 +#: sources.list.5.xml:251 msgid "&apt-cache; &apt-conf;" msgstr "" diff --git a/doc/po/ja.po b/doc/po/ja.po index 0176369b8..b79809055 100644 --- a/doc/po/ja.po +++ b/doc/po/ja.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.25.3\n" -"POT-Creation-Date: 2011-06-28 16:42+0200\n" +"POT-Creation-Date: 2011-11-20 17:58+0100\n" "PO-Revision-Date: 2010-09-07 07:38+0900\n" "Last-Translator: KURASAWA Nozomu <nabetaro@caldron.jp>\n" "Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n" @@ -791,7 +791,7 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:64 apt-cdrom.8.xml:50 apt-config.8.xml:50 -#: apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:114 +#: apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:121 #: apt-key.8.xml:38 apt-mark.8.xml:56 apt-secure.8.xml:43 #: apt-sortpkgs.1.xml:47 apt.conf.5.xml:42 apt_preferences.5.xml:36 #: sources.list.5.xml:36 @@ -814,7 +814,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt-cache.8.xml:70 apt-get.8.xml:120 +#: apt-cache.8.xml:70 apt-get.8.xml:127 msgid "" "Unless the <option>-h</option>, or <option>--help</option> option is given, " "one of the commands below must be present." @@ -1329,8 +1329,8 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:278 apt-config.8.xml:96 apt-extracttemplates.1.xml:59 -#: apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:126 -#: apt-sortpkgs.1.xml:57 apt.conf.5.xml:560 apt.conf.5.xml:582 +#: apt-ftparchive.1.xml:525 apt-get.8.xml:342 apt-mark.8.xml:126 +#: apt-sortpkgs.1.xml:57 apt.conf.5.xml:577 apt.conf.5.xml:599 msgid "options" msgstr "オプション" @@ -1357,7 +1357,7 @@ msgstr "" "pkgcache</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:288 apt-ftparchive.1.xml:572 apt-get.8.xml:393 +#: apt-cache.8.xml:288 apt-ftparchive.1.xml:572 apt-get.8.xml:404 #: apt-sortpkgs.1.xml:61 msgid "<option>-s</option>" msgstr "<option>-s</option>" @@ -1384,12 +1384,12 @@ msgstr "" "<literal>Dir::Cache::srcpkgcache</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:383 +#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:394 msgid "<option>-q</option>" msgstr "<option>-q</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:383 +#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:394 msgid "<option>--quiet</option>" msgstr "<option>--quiet</option>" @@ -1485,7 +1485,7 @@ msgstr "" "RecurseDepends</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:323 apt-cdrom.8.xml:124 apt-get.8.xml:350 +#: apt-cache.8.xml:323 apt-cdrom.8.xml:124 apt-get.8.xml:361 msgid "<option>-f</option>" msgstr "<option>-f</option>" @@ -1506,6 +1506,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:584 +#: apt-get.8.xml:447 msgid "<option>-a</option>" msgstr "<option>-a</option>" @@ -1627,15 +1628,15 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><variablelist> #: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101 -#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:612 apt-get.8.xml:570 +#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:612 apt-get.8.xml:591 #: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67 msgid "&apt-commonoptions;" msgstr "&apt-commonoptions;" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:172 apt-mark.8.xml:144 -#: apt.conf.5.xml:1093 apt_preferences.5.xml:697 +#: apt-cache.8.xml:372 apt-get.8.xml:596 apt-key.8.xml:175 apt-mark.8.xml:144 +#: apt.conf.5.xml:1110 apt_preferences.5.xml:697 msgid "Files" msgstr "ファイル" @@ -1647,10 +1648,10 @@ msgstr "&file-sourceslist; &file-statelists;" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106 -#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:628 apt-get.8.xml:585 -#: apt-key.8.xml:193 apt-mark.8.xml:150 apt-secure.8.xml:185 -#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:704 -#: sources.list.5.xml:234 +#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:628 apt-get.8.xml:606 +#: apt-key.8.xml:196 apt-mark.8.xml:150 apt-secure.8.xml:185 +#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1116 apt_preferences.5.xml:704 +#: sources.list.5.xml:250 msgid "See Also" msgstr "関連項目" @@ -1663,7 +1664,7 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111 -#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:632 apt-get.8.xml:591 +#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:632 apt-get.8.xml:612 #: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76 msgid "Diagnostics" msgstr "診断メッセージ" @@ -1800,12 +1801,12 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> -#: apt-cdrom.8.xml:94 apt-key.8.xml:158 +#: apt-cdrom.8.xml:94 apt-key.8.xml:161 msgid "Options" msgstr "オプション" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:540 apt-get.8.xml:345 +#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:540 apt-get.8.xml:356 msgid "<option>-d</option>" msgstr "<option>-d</option>" @@ -1849,7 +1850,7 @@ msgstr "" "ます。設定項目 - <literal>APT::CDROM::Rename</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cdrom.8.xml:116 apt-get.8.xml:364 +#: apt-cdrom.8.xml:116 apt-get.8.xml:375 msgid "<option>-m</option>" msgstr "<option>-m</option>" @@ -1908,17 +1909,17 @@ msgstr "" "できます。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cdrom.8.xml:143 apt-get.8.xml:395 +#: apt-cdrom.8.xml:143 apt-get.8.xml:406 msgid "<option>--just-print</option>" msgstr "<option>--just-print</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cdrom.8.xml:144 apt-get.8.xml:397 +#: apt-cdrom.8.xml:144 apt-get.8.xml:408 msgid "<option>--recon</option>" msgstr "<option>--recon</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cdrom.8.xml:145 apt-get.8.xml:398 +#: apt-cdrom.8.xml:145 apt-get.8.xml:409 msgid "<option>--no-act</option>" msgstr "<option>--no-act</option>" @@ -2159,7 +2160,7 @@ msgstr "" "<filename>package.config.XXXX</filename> と言った形になります。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-extracttemplates.1.xml:63 apt-get.8.xml:504 +#: apt-extracttemplates.1.xml:63 apt-get.8.xml:525 msgid "<option>-t</option>" msgstr "<option>-t</option>" @@ -2439,7 +2440,7 @@ msgstr "" "のディレクトリから作成するかを指定する、柔軟な方法を提供します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:145 apt-get.8.xml:287 +#: apt-ftparchive.1.xml:145 apt-get.8.xml:298 msgid "clean" msgstr "clean" @@ -3041,8 +3042,8 @@ msgstr "" "<literal>main contrib non-free</literal>のようになります。" # type: <tag></tag> -#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:394 +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:394 apt.conf.5.xml:157 msgid "Architectures" msgstr "Architectures" @@ -3465,8 +3466,8 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:617 apt.conf.5.xml:1087 apt_preferences.5.xml:544 -#: sources.list.5.xml:198 +#: apt-ftparchive.1.xml:617 apt.conf.5.xml:1104 apt_preferences.5.xml:544 +#: sources.list.5.xml:209 msgid "Examples" msgstr "サンプル" @@ -3523,15 +3524,45 @@ msgstr "APT パッケージ操作ユーティリティ -- コマンドライン #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> #: apt-get.8.xml:39 +#, fuzzy +#| msgid "" +#| "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> " +#| "<option>-o= <replaceable>config_string</replaceable> </option> </arg> " +#| "<arg> <option>-c= <replaceable>config_file</replaceable> </option> </arg> " +#| "<arg> <option>-t=</option> <arg choice='plain'> " +#| "<replaceable>target_release</replaceable> </arg> </arg> <group choice=" +#| "\"req\"> <arg choice='plain'>update</arg> <arg choice='plain'>upgrade</" +#| "arg> <arg choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-" +#| "upgrade</arg> <arg choice='plain'>install <arg choice=\"plain\" rep=" +#| "\"repeat\"><replaceable>pkg</replaceable> <arg> <group choice='req'> <arg " +#| "choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> " +#| "<arg choice='plain'> /<replaceable>target_release</replaceable> </arg> </" +#| "group> </arg> </arg> </arg> <arg choice='plain'>remove <arg choice=\"plain" +#| "\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg " +#| "choice='plain'>purge <arg choice=\"plain\" rep=\"repeat" +#| "\"><replaceable>pkg</replaceable></arg></arg> <arg choice='plain'>source " +#| "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> <arg> " +#| "<group choice='req'> <arg choice='plain'> " +#| "=<replaceable>pkg_version_number</replaceable> </arg> <arg " +#| "choice='plain'> /<replaceable>target_release</replaceable> </arg> </" +#| "group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice=" +#| "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg " +#| "choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg " +#| "choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg " +#| "choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg " +#| "choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> " +#| "<group choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--" +#| "help</arg> </group> </arg> </group>" msgid "" "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> " "<option>-o= <replaceable>config_string</replaceable> </option> </arg> <arg> " "<option>-c= <replaceable>config_file</replaceable> </option> </arg> <arg> " "<option>-t=</option> <arg choice='plain'> <replaceable>target_release</" -"replaceable> </arg> </arg> <group choice=\"req\"> <arg " -"choice='plain'>update</arg> <arg choice='plain'>upgrade</arg> <arg " -"choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-upgrade</arg> " -"<arg choice='plain'>install <arg choice=\"plain\" rep=\"repeat" +"replaceable> </arg> </arg> <arg> <option>-a=</option> <arg choice='plain'> " +"<replaceable>default_architecture</replaceable> </arg> </arg> <group choice=" +"\"req\"> <arg choice='plain'>update</arg> <arg choice='plain'>upgrade</arg> " +"<arg choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-upgrade</" +"arg> <arg choice='plain'>install <arg choice=\"plain\" rep=\"repeat" "\"><replaceable>pkg</replaceable> <arg> <group choice='req'> <arg " "choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> <arg " "choice='plain'> /<replaceable>target_release</replaceable> </arg> </group> </" @@ -3579,7 +3610,7 @@ msgstr "" "</group> </arg> </group>" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:115 +#: apt-get.8.xml:122 msgid "" "<command>apt-get</command> is the command-line tool for handling packages, " "and may be considered the user's \"back-end\" to other tools using the APT " @@ -3592,13 +3623,13 @@ msgstr "" "&wajig; などがあります。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:124 apt-key.8.xml:127 +#: apt-get.8.xml:131 apt-key.8.xml:127 msgid "update" msgstr "update" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:125 +#: apt-get.8.xml:132 msgid "" "<literal>update</literal> is used to resynchronize the package index files " "from their sources. The indexes of available packages are fetched from the " @@ -3621,13 +3652,13 @@ msgstr "" # type: <tag></tag> #. type: <tag></tag> -#: apt-get.8.xml:136 guide.sgml:121 +#: apt-get.8.xml:143 guide.sgml:121 msgid "upgrade" msgstr "upgrade" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:137 +#: apt-get.8.xml:144 msgid "" "<literal>upgrade</literal> is used to install the newest versions of all " "packages currently installed on the system from the sources enumerated in " @@ -3651,13 +3682,13 @@ msgstr "" # type: <tag></tag> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:149 +#: apt-get.8.xml:156 msgid "dselect-upgrade" msgstr "dselect-upgrade" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:150 +#: apt-get.8.xml:157 msgid "" "<literal>dselect-upgrade</literal> is used in conjunction with the " "traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</" @@ -3675,13 +3706,13 @@ msgstr "" # type: <tag></tag> #. type: <tag></tag> -#: apt-get.8.xml:159 guide.sgml:140 +#: apt-get.8.xml:166 guide.sgml:140 msgid "dist-upgrade" msgstr "dist-upgrade" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:160 +#: apt-get.8.xml:167 msgid "" "<literal>dist-upgrade</literal> in addition to performing the function of " "<literal>upgrade</literal>, also intelligently handles changing dependencies " @@ -3705,13 +3736,13 @@ msgstr "" # type: <tag></tag> #. type: <tag></tag> -#: apt-get.8.xml:172 guide.sgml:131 +#: apt-get.8.xml:179 guide.sgml:131 msgid "install" msgstr "install" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:174 +#: apt-get.8.xml:181 msgid "" "<literal>install</literal> is followed by one or more packages desired for " "installation or upgrading. Each package is a package name, not a fully " @@ -3738,7 +3769,7 @@ msgstr "" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:192 +#: apt-get.8.xml:199 msgid "" "A specific version of a package can be selected for installation by " "following the package name with an equals and the version of the package to " @@ -3756,7 +3787,7 @@ msgstr "" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:199 +#: apt-get.8.xml:206 msgid "" "Both of the version selection mechanisms can downgrade packages and must be " "used with care." @@ -3765,7 +3796,7 @@ msgstr "" "なりません。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:202 +#: apt-get.8.xml:209 msgid "" "This is also the target to use if you want to upgrade one or more already-" "installed packages without upgrading every package you have on your system. " @@ -3785,7 +3816,7 @@ msgstr "" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:213 +#: apt-get.8.xml:220 msgid "" "Finally, the &apt-preferences; mechanism allows you to create an alternative " "installation policy for individual packages." @@ -3795,7 +3826,7 @@ msgstr "" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:217 +#: apt-get.8.xml:224 msgid "" "If no package matches the given expression and the expression contains one " "of '.', '?' or '*' then it is assumed to be a POSIX regular expression, and " @@ -3812,13 +3843,13 @@ msgstr "" "ば、'^' や '$' を付けるか、もっと詳しい正規表現を指定してください。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:226 +#: apt-get.8.xml:233 msgid "remove" msgstr "remove" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:227 +#: apt-get.8.xml:234 msgid "" "<literal>remove</literal> is identical to <literal>install</literal> except " "that packages are removed instead of installed. Note the removing a package " @@ -3833,13 +3864,13 @@ msgstr "" "トールします。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:234 +#: apt-get.8.xml:241 msgid "purge" msgstr "purge" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:235 +#: apt-get.8.xml:242 msgid "" "<literal>purge</literal> is identical to <literal>remove</literal> except " "that packages are removed and purged (any configuration files are deleted " @@ -3850,13 +3881,13 @@ msgstr "" # type: Content of: <refentry><refnamediv><refname> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:239 +#: apt-get.8.xml:246 msgid "source" msgstr "source" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:240 +#: apt-get.8.xml:247 msgid "" "<literal>source</literal> causes <command>apt-get</command> to fetch source " "packages. APT will examine the available packages to decide which source " @@ -3875,7 +3906,7 @@ msgstr "" "literal> 構文で指定します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:248 +#: apt-get.8.xml:255 msgid "" "Source packages are tracked separately from binary packages via <literal>deb-" "src</literal> type lines in the &sources-list; file. This means that you " @@ -3890,12 +3921,19 @@ msgstr "" "もっと適切なものを取得します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:255 +#: apt-get.8.xml:262 +#, fuzzy +#| msgid "" +#| "If the <option>--compile</option> option is specified then the package " +#| "will be compiled to a binary .deb using <command>dpkg-buildpackage</" +#| "command>, if <option>--download-only</option> is specified then the " +#| "source package will not be unpacked." msgid "" "If the <option>--compile</option> option is specified then the package will " -"be compiled to a binary .deb using <command>dpkg-buildpackage</command>, if " -"<option>--download-only</option> is specified then the source package will " -"not be unpacked." +"be compiled to a binary .deb using <command>dpkg-buildpackage</command> for " +"the architecture as defined by the <command>--host-architecture</command> " +"option. If <option>--download-only</option> is specified then the source " +"package will not be unpacked." msgstr "" "<option>--compile</option> オプションを指定すると、<command>dpkg-" "buildpackage</command> を用いてバイナリ .deb パッケージをコンパイルします。" @@ -3904,7 +3942,7 @@ msgstr "" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:260 +#: apt-get.8.xml:269 msgid "" "A specific source version can be retrieved by postfixing the source name " "with an equals and then the version to fetch, similar to the mechanism used " @@ -3919,7 +3957,7 @@ msgstr "" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:266 +#: apt-get.8.xml:275 msgid "" "Note that source packages are not tracked like binary packages, they exist " "only in the current directory and are similar to downloading source tar " @@ -3929,28 +3967,35 @@ msgstr "" "展開されることに注意してください。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:271 +#: apt-get.8.xml:280 msgid "build-dep" msgstr "build-dep" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:272 +#: apt-get.8.xml:281 +#, fuzzy +#| msgid "" +#| "<literal>build-dep</literal> causes apt-get to install/remove packages in " +#| "an attempt to satisfy the build dependencies for a source package." msgid "" "<literal>build-dep</literal> causes apt-get to install/remove packages in an " -"attempt to satisfy the build dependencies for a source package." +"attempt to satisfy the build dependencies for a source package. By default " +"the dependencies are satisfied to build the package natively. If desired a " +"host-architecture can be specified with the <option>--host-architecture</" +"option> option instead." msgstr "" "<literal>build-dep</literal> は、ソースパッケージの構築依存関係を満たすよう" "に、パッケージのインストール・削除を行います。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:276 +#: apt-get.8.xml:287 msgid "check" msgstr "check" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:277 +#: apt-get.8.xml:288 msgid "" "<literal>check</literal> is a diagnostic tool; it updates the package cache " "and checks for broken dependencies." @@ -3959,12 +4004,12 @@ msgstr "" "チェックする診断ツールです。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:281 +#: apt-get.8.xml:292 msgid "download" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:282 +#: apt-get.8.xml:293 msgid "" "<literal>download</literal> will download the given binary package into the " "current directory." @@ -3972,7 +4017,7 @@ msgstr "" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:288 +#: apt-get.8.xml:299 msgid "" "<literal>clean</literal> clears out the local repository of retrieved " "package files. It removes everything but the lock file from " @@ -3990,13 +4035,13 @@ msgstr "" "<literal>apt-get clean</literal> を実行したくなるでしょう。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:297 +#: apt-get.8.xml:308 msgid "autoclean" msgstr "autoclean" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:298 +#: apt-get.8.xml:309 msgid "" "Like <literal>clean</literal>, <literal>autoclean</literal> clears out the " "local repository of retrieved package files. The difference is that it only " @@ -4015,28 +4060,33 @@ msgstr "" "防げます。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:307 +#: apt-get.8.xml:318 msgid "autoremove" msgstr "autoremove" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:308 +#: apt-get.8.xml:319 +#, fuzzy +#| msgid "" +#| "<literal>autoremove</literal> is used to remove packages that were " +#| "automatically installed to satisfy dependencies for some package and that " +#| "are no more needed." msgid "" "<literal>autoremove</literal> is used to remove packages that were " -"automatically installed to satisfy dependencies for some package and that " -"are no more needed." +"automatically installed to satisfy dependencies for other packages and are " +"now no longer needed." msgstr "" "<literal>autoremove</literal> は、依存関係を満たすために自動的にインストール" "され、もう必要なくなったパッケージを削除するのに使用します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:312 +#: apt-get.8.xml:323 msgid "changelog" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:313 +#: apt-get.8.xml:324 msgid "" "<literal>changelog</literal> downloads a package changelog and displays it " "through <command>sensible-pager</command>. The server name and base " @@ -4049,13 +4099,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:335 +#: apt-get.8.xml:346 msgid "<option>--no-install-recommends</option>" msgstr "<option>--no-install-recommends</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:336 +#: apt-get.8.xml:347 msgid "" "Do not consider recommended packages as a dependency for installing. " "Configuration Item: <literal>APT::Install-Recommends</literal>." @@ -4064,7 +4114,7 @@ msgstr "" "<literal>APT::Install-Recommends</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:340 +#: apt-get.8.xml:351 #, fuzzy #| msgid "<option>--no-suggests</option>" msgid "<option>--install-suggests</option>" @@ -4072,7 +4122,7 @@ msgstr "<option>--no-suggests</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:341 +#: apt-get.8.xml:352 #, fuzzy #| msgid "" #| "Do not consider recommended packages as a dependency for installing. " @@ -4085,13 +4135,13 @@ msgstr "" "<literal>APT::Install-Recommends</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:345 +#: apt-get.8.xml:356 msgid "<option>--download-only</option>" msgstr "<option>--download-only</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:346 +#: apt-get.8.xml:357 msgid "" "Download only; package files are only retrieved, not unpacked or installed. " "Configuration Item: <literal>APT::Get::Download-Only</literal>." @@ -4100,13 +4150,13 @@ msgstr "" "いません。設定項目 - <literal>APT::Get::Download-Only</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:350 +#: apt-get.8.xml:361 msgid "<option>--fix-broken</option>" msgstr "<option>--fix-broken</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:351 +#: apt-get.8.xml:362 msgid "" "Fix; attempt to correct a system with broken dependencies in place. This " "option, when used with install/remove, can omit any packages to permit APT " @@ -4132,18 +4182,18 @@ msgstr "" "<literal>APT::Get::Fix-Broken</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:364 +#: apt-get.8.xml:375 msgid "<option>--ignore-missing</option>" msgstr "<option>--ignore-missing</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:365 +#: apt-get.8.xml:376 msgid "<option>--fix-missing</option>" msgstr "<option>--fix-missing</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:366 +#: apt-get.8.xml:377 msgid "" "Ignore missing packages; If packages cannot be retrieved or fail the " "integrity check after retrieval (corrupted package files), hold back those " @@ -4162,13 +4212,13 @@ msgstr "" "Get::Fix-Missing</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:376 +#: apt-get.8.xml:387 msgid "<option>--no-download</option>" msgstr "<option>--no-download</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:377 +#: apt-get.8.xml:388 msgid "" "Disables downloading of packages. This is best used with <option>--ignore-" "missing</option> to force APT to use only the .debs it has already " @@ -4180,7 +4230,7 @@ msgstr "" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:384 +#: apt-get.8.xml:395 msgid "" "Quiet; produces output suitable for logging, omitting progress indicators. " "More q's will produce more quiet up to a maximum of 2. You can also use " @@ -4199,18 +4249,18 @@ msgstr "" "literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:394 +#: apt-get.8.xml:405 msgid "<option>--simulate</option>" msgstr "<option>--simulate</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:396 +#: apt-get.8.xml:407 msgid "<option>--dry-run</option>" msgstr "<option>--dry-run</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:399 +#: apt-get.8.xml:410 msgid "" "No action; perform a simulation of events that would occur but do not " "actually change the system. Configuration Item: <literal>APT::Get::" @@ -4220,7 +4270,7 @@ msgstr "" "行いません。設定項目 - <literal>APT::Get::Simulate</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:403 +#: apt-get.8.xml:414 msgid "" "Simulation run as user will deactivate locking (<literal>Debug::NoLocking</" "literal>) automatic. Also a notice will be displayed indicating that this " @@ -4238,7 +4288,7 @@ msgstr "" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:409 +#: apt-get.8.xml:420 msgid "" "Simulate prints out a series of lines each one representing a dpkg " "operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square brackets " @@ -4250,23 +4300,23 @@ msgstr "" "空の角カッコは大した問題ではないことを表します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:416 +#: apt-get.8.xml:427 msgid "<option>-y</option>" msgstr "<option>-y</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:416 +#: apt-get.8.xml:427 msgid "<option>--yes</option>" msgstr "<option>--yes</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:417 +#: apt-get.8.xml:428 msgid "<option>--assume-yes</option>" msgstr "<option>--assume-yes</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:418 +#: apt-get.8.xml:429 msgid "" "Automatic yes to prompts; assume \"yes\" as answer to all prompts and run " "non-interactively. If an undesirable situation, such as changing a held " @@ -4280,18 +4330,18 @@ msgstr "" "定項目 - <literal>APT::Get::Assume-Yes</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:425 +#: apt-get.8.xml:436 msgid "<option>-u</option>" msgstr "<option>-u</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:425 +#: apt-get.8.xml:436 msgid "<option>--show-upgraded</option>" msgstr "<option>--show-upgraded</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:426 +#: apt-get.8.xml:437 msgid "" "Show upgraded packages; Print out a list of all packages that are to be " "upgraded. Configuration Item: <literal>APT::Get::Show-Upgraded</literal>." @@ -4300,18 +4350,18 @@ msgstr "" "<literal>APT::Get::Show-Upgraded</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:431 +#: apt-get.8.xml:442 msgid "<option>-V</option>" msgstr "<option>-V</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:431 +#: apt-get.8.xml:442 msgid "<option>--verbose-versions</option>" msgstr "<option>--verbose-versions</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:432 +#: apt-get.8.xml:443 msgid "" "Show full versions for upgraded and installed packages. Configuration Item: " "<literal>APT::Get::Show-Versions</literal>." @@ -4320,23 +4370,41 @@ msgstr "" "<literal>APT::Get::Show-Versions</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:436 +#: apt-get.8.xml:448 +#, fuzzy +#| msgid "<option>--recurse</option>" +msgid "<option>--host-architecture</option>" +msgstr "<option>--recurse</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:449 +msgid "" +"This option controls the architecture packages are built for by <command>apt-" +"get source --compile</command> and how cross-builddependencies are " +"satisfied. By default is it not set which means that the host architecture " +"is the same as the build architecture (which is defined by <literal>APT::" +"Architecture</literal>). Configuration Item: <literal>APT::Get::Host-" +"Architecture</literal>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:457 msgid "<option>-b</option>" msgstr "<option>-b</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:436 +#: apt-get.8.xml:457 msgid "<option>--compile</option>" msgstr "<option>--compile</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:437 +#: apt-get.8.xml:458 msgid "<option>--build</option>" msgstr "<option>--build</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:438 +#: apt-get.8.xml:459 msgid "" "Compile source packages after downloading them. Configuration Item: " "<literal>APT::Get::Compile</literal>." @@ -4345,13 +4413,13 @@ msgstr "" "Get::Compile</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:442 +#: apt-get.8.xml:463 msgid "<option>--ignore-hold</option>" msgstr "<option>--ignore-hold</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:443 +#: apt-get.8.xml:464 msgid "" "Ignore package Holds; This causes <command>apt-get</command> to ignore a " "hold placed on a package. This may be useful in conjunction with " @@ -4364,13 +4432,13 @@ msgstr "" "Hold</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:449 +#: apt-get.8.xml:470 msgid "<option>--no-upgrade</option>" msgstr "<option>--no-upgrade</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:450 +#: apt-get.8.xml:471 msgid "" "Do not upgrade packages; When used in conjunction with <literal>install</" "literal>, <literal>no-upgrade</literal> will prevent packages on the command " @@ -4382,12 +4450,12 @@ msgstr "" "ある場合に更新を行いません。設定項目 - <literal>APT::Get::Upgrade</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:456 +#: apt-get.8.xml:477 msgid "<option>--only-upgrade</option>" msgstr "<option>--only-upgrade</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:457 +#: apt-get.8.xml:478 #, fuzzy msgid "" "Do not install new packages; When used in conjunction with <literal>install</" @@ -4400,13 +4468,13 @@ msgstr "" "ある場合に更新を行いません。設定項目 - <literal>APT::Get::Upgrade</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:463 +#: apt-get.8.xml:484 msgid "<option>--force-yes</option>" msgstr "<option>--force-yes</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:464 +#: apt-get.8.xml:485 msgid "" "Force yes; This is a dangerous option that will cause apt to continue " "without prompting if it is doing something potentially harmful. It should " @@ -4420,13 +4488,13 @@ msgstr "" "ねません! 設定項目 - <literal>APT::Get::force-yes</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:471 +#: apt-get.8.xml:492 msgid "<option>--print-uris</option>" msgstr "<option>--print-uris</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:472 +#: apt-get.8.xml:493 msgid "" "Instead of fetching the files to install their URIs are printed. Each URI " "will have the path, the destination file name, the size and the expected md5 " @@ -4447,13 +4515,13 @@ msgstr "" "Print-URIs</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:482 +#: apt-get.8.xml:503 msgid "<option>--purge</option>" msgstr "<option>--purge</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:483 +#: apt-get.8.xml:504 msgid "" "Use purge instead of remove for anything that would be removed. An asterisk " "(\"*\") will be displayed next to packages which are scheduled to be purged. " @@ -4466,13 +4534,13 @@ msgstr "" "<literal>APT::Get::Purge</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:490 +#: apt-get.8.xml:511 msgid "<option>--reinstall</option>" msgstr "<option>--reinstall</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:491 +#: apt-get.8.xml:512 msgid "" "Re-Install packages that are already installed and at the newest version. " "Configuration Item: <literal>APT::Get::ReInstall</literal>." @@ -4481,13 +4549,13 @@ msgstr "" "定項目 - <literal>APT::Get::ReInstall</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:495 +#: apt-get.8.xml:516 msgid "<option>--list-cleanup</option>" msgstr "<option>--list-cleanup</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:496 +#: apt-get.8.xml:517 msgid "" "This option defaults to on, use <literal>--no-list-cleanup</literal> to turn " "it off. When on <command>apt-get</command> will automatically manage the " @@ -4503,18 +4571,18 @@ msgstr "" "する時ぐらいでしょう。設定項目 - <literal>APT::Get::List-Cleanup</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:505 +#: apt-get.8.xml:526 msgid "<option>--target-release</option>" msgstr "<option>--target-release</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:506 +#: apt-get.8.xml:527 msgid "<option>--default-release</option>" msgstr "<option>--default-release</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:507 +#: apt-get.8.xml:528 msgid "" "This option controls the default input to the policy engine, it creates a " "default pin at priority 990 using the specified release string. This " @@ -4536,13 +4604,13 @@ msgstr "" "Release</literal>。&apt-preferences; のマニュアルページもご覧ください。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:520 +#: apt-get.8.xml:541 msgid "<option>--trivial-only</option>" msgstr "<option>--trivial-only</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:522 +#: apt-get.8.xml:543 msgid "" "Only perform operations that are 'trivial'. Logically this can be considered " "related to <option>--assume-yes</option>, where <option>--assume-yes</" @@ -4555,13 +4623,13 @@ msgstr "" "目 - <literal>APT::Get::Trivial-Only</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:528 +#: apt-get.8.xml:549 msgid "<option>--no-remove</option>" msgstr "<option>--no-remove</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:529 +#: apt-get.8.xml:550 msgid "" "If any packages are to be removed apt-get immediately aborts without " "prompting. Configuration Item: <literal>APT::Get::Remove</literal>." @@ -4570,13 +4638,13 @@ msgstr "" "項目 - <literal>APT::Get::Remove</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:534 +#: apt-get.8.xml:555 msgid "<option>--auto-remove</option>" msgstr "<option>--auto-remove</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:535 +#: apt-get.8.xml:556 msgid "" "If the command is either <literal>install</literal> or <literal>remove</" "literal>, then this option acts like running <literal>autoremove</literal> " @@ -4589,13 +4657,13 @@ msgstr "" "literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:541 +#: apt-get.8.xml:562 msgid "<option>--only-source</option>" msgstr "<option>--only-source</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:542 +#: apt-get.8.xml:563 msgid "" "Only has meaning for the <literal>source</literal> and <literal>build-dep</" "literal> commands. Indicates that the given source names are not to be " @@ -4613,23 +4681,23 @@ msgstr "" "literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:552 +#: apt-get.8.xml:573 msgid "<option>--diff-only</option>" msgstr "<option>--diff-only</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:552 +#: apt-get.8.xml:573 msgid "<option>--dsc-only</option>" msgstr "<option>--dsc-only</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:552 +#: apt-get.8.xml:573 msgid "<option>--tar-only</option>" msgstr "<option>--tar-only</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:553 +#: apt-get.8.xml:574 msgid "" "Download only the diff, dsc, or tar file of a source archive. Configuration " "Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</" @@ -4640,13 +4708,13 @@ msgstr "" "Only</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:558 +#: apt-get.8.xml:579 msgid "<option>--arch-only</option>" msgstr "<option>--arch-only</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:559 +#: apt-get.8.xml:580 msgid "" "Only process architecture-dependent build-dependencies. Configuration Item: " "<literal>APT::Get::Arch-Only</literal>." @@ -4655,13 +4723,13 @@ msgstr "" "<literal>APT::Get::Arch-Only</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:563 +#: apt-get.8.xml:584 msgid "<option>--allow-unauthenticated</option>" msgstr "<option>--allow-unauthenticated</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:564 +#: apt-get.8.xml:585 msgid "" "Ignore if packages can't be authenticated and don't prompt about it. This " "is useful for tools like pbuilder. Configuration Item: <literal>APT::Get::" @@ -4672,7 +4740,7 @@ msgstr "" "literal>" #. type: Content of: <refentry><refsect1><variablelist> -#: apt-get.8.xml:577 +#: apt-get.8.xml:598 msgid "" "&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; " "&file-statelists;" @@ -4682,7 +4750,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:586 +#: apt-get.8.xml:607 msgid "" "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, " "&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-" @@ -4694,7 +4762,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:592 +#: apt-get.8.xml:613 msgid "" "<command>apt-get</command> returns zero on normal operation, decimal 100 on " "error." @@ -4703,22 +4771,22 @@ msgstr "" "100 を返します。" #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:595 +#: apt-get.8.xml:616 msgid "ORIGINAL AUTHORS" msgstr "原著者" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:596 +#: apt-get.8.xml:617 msgid "&apt-author.jgunthorpe;" msgstr "&apt-author.jgunthorpe;" #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:599 +#: apt-get.8.xml:620 msgid "CURRENT AUTHORS" msgstr "現著者" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:601 +#: apt-get.8.xml:622 msgid "&apt-author.team;" msgstr "&apt-author.team;" @@ -4857,34 +4925,36 @@ msgstr "" "gpg に上級オプションを渡します。adv --recv-key とすると、公開鍵をダウンロード" "できます。" -# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:131 msgid "" -"Update the local keyring with the keyring of Debian archive keys and removes " -"from the keyring the archive keys which are no longer valid." +"Update the local keyring with the archive keyring and remove from the local " +"keyring the archive keys which are no longer valid. The archive keyring is " +"shipped in the <literal>archive-keyring</literal> package of your " +"distribution, e.g. the <literal>debian-archive-keyring</literal> package in " +"Debian." msgstr "" -"Debian アーカイブキーで、ローカルキーリングを更新し、もう有効でないキーをキー" -"リングから削除します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:140 +#: apt-key.8.xml:141 #, fuzzy #| msgid "update" msgid "net-update" msgstr "update" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:144 +#: apt-key.8.xml:145 msgid "" -"Update the local keyring with the keys of a key server and removes from the " -"keyring the archive keys which are no longer valid. This requires an " -"installed wget and an APT build configured to have a server to fetch from. " -"APT in Debian does not support this command, but Ubuntu's APT does." +"Work similar to the <command>update</command> command above, but get the " +"archive keyring from an URI instead and validate it against a master key. " +"This requires an installed &wget; and an APT build configured to have a " +"server to fetch from and a master keyring to validate. APT in Debian does " +"not support this command and relies on <command>update</command> instead, " +"but Ubuntu's APT does." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-key.8.xml:159 +#: apt-key.8.xml:162 msgid "" "Note that options need to be defined before the commands described in the " "previous section." @@ -4894,17 +4964,17 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><programlisting> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:161 +#: apt-key.8.xml:164 msgid "--keyring <replaceable>filename</replaceable>" msgstr "--keyring <replaceable>filename</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:162 +#: apt-key.8.xml:165 msgid "" "With this option it is possible to specify a specific keyring file the " "command should operate on. The default is that a command is executed on the " "<filename>trusted.gpg</filename> file as well as on all parts in the " -"<filename>trusted.gpg.d</filename> directory, through <filename>trusted.gpg</" +"<filename>trusted.gpg.d</filename> directory, though <filename>trusted.gpg</" "filename> is the primary keyring which means that e.g. new keys are added to " "this one." msgstr "" @@ -4915,35 +4985,35 @@ msgstr "" "加されます。" #. type: Content of: <refentry><refsect1><variablelist> -#: apt-key.8.xml:175 +#: apt-key.8.xml:178 msgid "&file-trustedgpg;" msgstr "&file-trustedgpg;" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:177 +#: apt-key.8.xml:180 msgid "<filename>/etc/apt/trustdb.gpg</filename>" msgstr "<filename>/etc/apt/trustdb.gpg</filename>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:178 +#: apt-key.8.xml:181 msgid "Local trust database of archive keys." msgstr "アーカイブキーのローカル信頼データベースです。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:181 +#: apt-key.8.xml:184 msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:182 +#: apt-key.8.xml:185 msgid "Keyring of Debian archive trusted keys." msgstr "Debian アーカイブ信頼キーのキーリングです。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:185 +#: apt-key.8.xml:188 msgid "" "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" msgstr "" @@ -4951,13 +5021,13 @@ msgstr "" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:186 +#: apt-key.8.xml:189 msgid "Keyring of Debian archive removed trusted keys." msgstr "削除された Debian アーカイブ信頼キーのキーリングです。" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt-key.8.xml:195 +#: apt-key.8.xml:198 msgid "&apt-get;, &apt-secure;" msgstr "&apt-get;, &apt-secure;" @@ -5973,14 +6043,25 @@ msgstr "" "に使用するアーキテクチャをセットします。内部でのデフォルトは、apt をコンパイ" "ルしたアーキテクチャです。" +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:158 +msgid "" +"All Architectures the system supports. Processors implementing the " +"<literal>amd64</literal> are e.g. also able to execute binaries compiled for " +"<literal>i386</literal>; This list is use when fetching files and parsing " +"package lists. The internal default is always the native architecture " +"(<literal>APT::Architecture</literal>) and all foreign architectures it can " +"retrieve by calling <command>dpkg --print-foreign-architectures</command>." +msgstr "" + # type: Content of: <refentry><refsect1><refsect2><para><programlisting> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:157 +#: apt.conf.5.xml:165 msgid "Default-Release" msgstr "Default-Release" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:158 +#: apt.conf.5.xml:166 msgid "" "Default release to install packages from if more than one version available. " "Contains release name, codename or release version. Examples: 'stable', " @@ -5993,13 +6074,13 @@ msgstr "" "'4.0', '5.0*' となります。&apt-preferences; も参照してください。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:163 +#: apt.conf.5.xml:171 msgid "Ignore-Hold" msgstr "Ignore-Hold" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:164 +#: apt.conf.5.xml:172 msgid "" "Ignore Held packages; This global option causes the problem resolver to " "ignore held packages in its decision making." @@ -6009,13 +6090,13 @@ msgstr "" # type: <tag></tag> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:168 +#: apt.conf.5.xml:176 msgid "Clean-Installed" msgstr "Clean-Installed" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:169 +#: apt.conf.5.xml:177 msgid "" "Defaults to on. When turned on the autoclean feature will remove any " "packages which can no longer be downloaded from the cache. If turned off " @@ -6030,12 +6111,12 @@ msgstr "" # type: Content of: <refentry><refnamediv><refname> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:175 +#: apt.conf.5.xml:183 msgid "Immediate-Configure" msgstr "Immediate-Configure" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:176 +#: apt.conf.5.xml:184 msgid "" "Defaults to on which will cause APT to install essential and important " "packages as fast as possible in the install/upgrade operation. This is done " @@ -6091,13 +6172,13 @@ msgstr "" "レポートをおねがいします。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:198 +#: apt.conf.5.xml:206 msgid "Force-LoopBreak" msgstr "Force-LoopBreak" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:199 +#: apt.conf.5.xml:207 msgid "" "Never Enable this option unless you -really- know what you are doing. It " "permits APT to temporarily remove an essential package to break a Conflicts/" @@ -6115,12 +6196,12 @@ msgstr "" "不可欠パッケージで動作します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:207 +#: apt.conf.5.xml:215 msgid "Cache-Start, Cache-Grow and Cache-Limit" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:208 +#: apt.conf.5.xml:216 msgid "" "APT uses since version 0.7.26 a resizable memory mapped cache file to store " "the 'available' information. <literal>Cache-Start</literal> acts as a hint " @@ -6140,24 +6221,24 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:223 +#: apt.conf.5.xml:231 msgid "Build-Essential" msgstr "Build-Essential" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:224 +#: apt.conf.5.xml:232 msgid "Defines which package(s) are considered essential build dependencies." msgstr "構築依存関係で不可欠なパッケージを定義します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:227 +#: apt.conf.5.xml:235 msgid "Get" msgstr "Get" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:228 +#: apt.conf.5.xml:236 msgid "" "The Get subsection controls the &apt-get; tool, please see its documentation " "for more information about the options here." @@ -6166,13 +6247,13 @@ msgstr "" "&apt-get; の文書を参照してください。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:232 +#: apt.conf.5.xml:240 msgid "Cache" msgstr "Cache" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:233 +#: apt.conf.5.xml:241 msgid "" "The Cache subsection controls the &apt-cache; tool, please see its " "documentation for more information about the options here." @@ -6181,13 +6262,13 @@ msgstr "" "は &apt-cache; の文書を参照してください。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:237 +#: apt.conf.5.xml:245 msgid "CDROM" msgstr "CDROM" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:238 +#: apt.conf.5.xml:246 msgid "" "The CDROM subsection controls the &apt-cdrom; tool, please see its " "documentation for more information about the options here." @@ -6197,17 +6278,17 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:244 +#: apt.conf.5.xml:252 msgid "The Acquire Group" msgstr "Acquire グループ" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:249 +#: apt.conf.5.xml:257 msgid "Check-Valid-Until" msgstr "Check-Valid-Until" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:250 +#: apt.conf.5.xml:258 msgid "" "Security related option defaulting to true as an expiring validation for a " "Release file prevents longtime replay attacks and can e.g. also help users " @@ -6219,31 +6300,46 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:260 +#: apt.conf.5.xml:268 msgid "Max-ValidTime" msgstr "Max-ValidTime" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:261 +#: apt.conf.5.xml:269 msgid "" -"Seconds the Release file should be considered valid after it was created. " -"The default is \"for ever\" (0) if the Release file of the archive doesn't " -"include a <literal>Valid-Until</literal> header. If it does then this date " -"is the default. The date from the Release file or the date specified by the " -"creation time of the Release file (<literal>Date</literal> header) plus the " -"seconds specified with this options are used to check if the validation of a " -"file has expired by using the earlier date of the two. Archive specific " -"settings can be made by appending the label of the archive to the option " -"name." +"Seconds the Release file should be considered valid after it was created " +"(indicated by the <literal>Date</literal> header). If the Release file " +"itself includes a <literal>Valid-Until</literal> header the earlier date of " +"the two is used as the expiration date. The default value is <literal>0</" +"literal> which stands for \"for ever\". Archive specific settings can be " +"made by appending the label of the archive to the option name." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:273 +#: apt.conf.5.xml:279 +#, fuzzy +#| msgid "Max-ValidTime" +msgid "Min-ValidTime" +msgstr "Max-ValidTime" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:280 +msgid "" +"Minimum of seconds the Release file should be considered valid after it was " +"created (indicated by the <literal>Date</literal> header). Use this if you " +"need to use a seldomly updated (local) mirror of a more regular updated " +"archive with a <literal>Valid-Until</literal> header instead of completely " +"disabling the expiration date checking. Archive specific settings can and " +"should be used by appending the label of the archive to the option name." +msgstr "" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: apt.conf.5.xml:290 msgid "PDiffs" msgstr "PDiffs" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:274 +#: apt.conf.5.xml:291 msgid "" "Try to download deltas called <literal>PDiffs</literal> for Packages or " "Sources files instead of downloading whole ones. True by default." @@ -6253,7 +6349,7 @@ msgstr "" "ルトでは True です。" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:277 +#: apt.conf.5.xml:294 msgid "" "Two sub-options to limit the use of PDiffs are also available: With " "<literal>FileLimit</literal> can be specified how many PDiff files are " @@ -6269,13 +6365,13 @@ msgstr "" "をダウンロードする代わりに、完全なファイルをダウンロードします。" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:286 +#: apt.conf.5.xml:303 msgid "Queue-Mode" msgstr "Queue-Mode" # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:287 +#: apt.conf.5.xml:304 msgid "" "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</" "literal> or <literal>access</literal> which determines how APT parallelizes " @@ -6290,13 +6386,13 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><title> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:294 +#: apt.conf.5.xml:311 msgid "Retries" msgstr "Retries" # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:295 +#: apt.conf.5.xml:312 msgid "" "Number of retries to perform. If this is non-zero APT will retry failed " "files the given number of times." @@ -6305,13 +6401,13 @@ msgstr "" "えられた回数だけリトライを行います。" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:299 +#: apt.conf.5.xml:316 msgid "Source-Symlinks" msgstr "Source-Symlinks" # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:300 +#: apt.conf.5.xml:317 msgid "" "Use symlinks for source archives. If set to true then source archives will " "be symlinked when possible instead of copying. True is the default." @@ -6322,13 +6418,13 @@ msgstr "" # type: <tag></tag> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:304 sources.list.5.xml:144 +#: apt.conf.5.xml:321 sources.list.5.xml:155 msgid "http" msgstr "http" # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:305 +#: apt.conf.5.xml:322 msgid "" "HTTP URIs; http::Proxy is the default http proxy to use. It is in the " "standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per " @@ -6346,7 +6442,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:313 +#: apt.conf.5.xml:330 msgid "" "Three settings are provided for cache control with HTTP/1.1 compliant proxy " "caches. <literal>No-Cache</literal> tells the proxy to not use its cached " @@ -6371,7 +6467,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:323 apt.conf.5.xml:387 +#: apt.conf.5.xml:340 apt.conf.5.xml:404 msgid "" "The option <literal>timeout</literal> sets the timeout timer used by the " "method, this applies to all things including connection timeout and data " @@ -6383,7 +6479,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:326 +#: apt.conf.5.xml:343 msgid "" "One setting is provided to control the pipeline depth in cases where the " "remote server is not RFC conforming or buggy (such as Squid 2.0.2). " @@ -6402,7 +6498,7 @@ msgstr "" "ます。" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:334 +#: apt.conf.5.xml:351 msgid "" "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</" "literal> which accepts integer values in kilobyte. The default value is 0 " @@ -6416,7 +6512,7 @@ msgstr "" "ロードしなくなることに注意してください)。" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:339 +#: apt.conf.5.xml:356 msgid "" "<literal>Acquire::http::User-Agent</literal> can be used to set a different " "User-Agent for the http download method as some proxies allow access for " @@ -6428,12 +6524,12 @@ msgstr "" # type: <tag></tag> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:345 +#: apt.conf.5.xml:362 msgid "https" msgstr "https" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:346 +#: apt.conf.5.xml:363 msgid "" "HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy " "options are the same as for <literal>http</literal> method and will also " @@ -6448,7 +6544,7 @@ msgstr "" "いません。" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:352 +#: apt.conf.5.xml:369 msgid "" "<literal>CaInfo</literal> suboption specifies place of file that holds info " "about trusted certificates. <literal><host>::CaInfo</literal> is " @@ -6485,13 +6581,13 @@ msgstr "" # type: <tag></tag> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:370 sources.list.5.xml:155 +#: apt.conf.5.xml:387 sources.list.5.xml:166 msgid "ftp" msgstr "ftp" # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:371 +#: apt.conf.5.xml:388 msgid "" "FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard " "form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host " @@ -6524,7 +6620,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:390 +#: apt.conf.5.xml:407 msgid "" "Several settings are provided to control passive mode. Generally it is safe " "to leave passive mode on, it works in nearly every environment. However " @@ -6540,7 +6636,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:397 +#: apt.conf.5.xml:414 msgid "" "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</" "envar> environment variable to a http url - see the discussion of the http " @@ -6554,7 +6650,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:402 +#: apt.conf.5.xml:419 msgid "" "The setting <literal>ForceExtended</literal> controls the use of RFC2428 " "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is " @@ -6571,19 +6667,19 @@ msgstr "" # type: Content of: <refentry><refnamediv><refname> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:409 sources.list.5.xml:137 +#: apt.conf.5.xml:426 sources.list.5.xml:148 msgid "cdrom" msgstr "cdrom" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:415 +#: apt.conf.5.xml:432 #, no-wrap msgid "/cdrom/::Mount \"foo\";" msgstr "/cdrom/::Mount \"foo\";" # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:410 +#: apt.conf.5.xml:427 msgid "" "CDROM URIs; the only setting for CDROM URIs is the mount point, " "<literal>cdrom::Mount</literal> which must be the mount point for the CDROM " @@ -6604,13 +6700,13 @@ msgstr "" "す。" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:420 +#: apt.conf.5.xml:437 msgid "gpgv" msgstr "gpgv" # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:421 +#: apt.conf.5.xml:438 msgid "" "GPGV URIs; the only option for GPGV URIs is the option to pass additional " "parameters to gpgv. <literal>gpgv::Options</literal> Additional options " @@ -6621,18 +6717,18 @@ msgstr "" "す。" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:426 +#: apt.conf.5.xml:443 msgid "CompressionTypes" msgstr "CompressionTypes" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:432 +#: apt.conf.5.xml:449 #, no-wrap msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";" msgstr "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:427 +#: apt.conf.5.xml:444 msgid "" "List of compression types which are understood by the acquire methods. " "Files like <filename>Packages</filename> can be available in various " @@ -6650,19 +6746,19 @@ msgstr "" "す。構文は以下のようになります。<placeholder type=\"synopsis\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:437 +#: apt.conf.5.xml:454 #, no-wrap msgid "Acquire::CompressionTypes::Order:: \"gz\";" msgstr "Acquire::CompressionTypes::Order:: \"gz\";" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:440 +#: apt.conf.5.xml:457 #, no-wrap msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:433 +#: apt.conf.5.xml:450 msgid "" "Also the <literal>Order</literal> subgroup can be used to define in which " "order the acquire system will try to download the compressed files. The " @@ -6690,13 +6786,13 @@ msgstr "" "<literal>bz2</literal> は自動的に追加されるため、明示する必要はありません。" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:444 +#: apt.conf.5.xml:461 #, no-wrap msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:442 +#: apt.conf.5.xml:459 #, fuzzy #| msgid "" #| "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</" @@ -6732,7 +6828,7 @@ msgstr "" "す。" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:449 +#: apt.conf.5.xml:466 msgid "" "The special type <literal>uncompressed</literal> can be used to give " "uncompressed files a preference, but note that most archives don't provide " @@ -6741,12 +6837,12 @@ msgstr "" # type: <tag></tag> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:454 +#: apt.conf.5.xml:471 msgid "GzipIndexes" msgstr "GzipIndexes" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:456 +#: apt.conf.5.xml:473 msgid "" "When downloading <literal>gzip</literal> compressed indexes (Packages, " "Sources, or Translations), keep them gzip compressed locally instead of " @@ -6755,12 +6851,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:463 +#: apt.conf.5.xml:480 msgid "Languages" msgstr "Languages" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:464 +#: apt.conf.5.xml:481 msgid "" "The Languages subsection controls which <filename>Translation</filename> " "files are downloaded and in which order APT tries to display the Description-" @@ -6773,13 +6869,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting> -#: apt.conf.5.xml:480 +#: apt.conf.5.xml:497 #, no-wrap msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" msgstr "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:470 +#: apt.conf.5.xml:487 msgid "" "The default list includes \"environment\" and \"en\". " "\"<literal>environment</literal>\" has a special meaning here: It will be " @@ -6803,7 +6899,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:245 +#: apt.conf.5.xml:253 msgid "" "The <literal>Acquire</literal> group of options controls the download of " "packages and the URI handlers. <placeholder type=\"variablelist\" id=\"0\"/>" @@ -6814,13 +6910,13 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><title> #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:487 +#: apt.conf.5.xml:504 msgid "Directories" msgstr "ディレクトリ" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:489 +#: apt.conf.5.xml:506 msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " "local state information. <literal>lists</literal> is the directory to place " @@ -6840,7 +6936,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:496 +#: apt.conf.5.xml:513 msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " "information, such as the two package caches <literal>srcpkgcache</literal> " @@ -6862,7 +6958,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:505 +#: apt.conf.5.xml:522 msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " "<literal>sourcelist</literal> gives the location of the sourcelist and " @@ -6877,7 +6973,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:511 +#: apt.conf.5.xml:528 msgid "" "The <literal>Dir::Parts</literal> setting reads in all the config fragments " "in lexical order from the directory specified. After this is done then the " @@ -6889,7 +6985,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:515 +#: apt.conf.5.xml:532 msgid "" "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::" "Bin::Methods</literal> specifies the location of the method handlers and " @@ -6907,7 +7003,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:523 +#: apt.conf.5.xml:540 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@ -6927,7 +7023,7 @@ msgstr "" "<filename>/tmp/staging/var/lib/dpkg/status</filename> から探します。" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:536 +#: apt.conf.5.xml:553 msgid "" "The <literal>Ignore-Files-Silently</literal> list can be used to specify " "which files APT should silently ignore while parsing the files in the " @@ -6939,13 +7035,13 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:545 +#: apt.conf.5.xml:562 msgid "APT in DSelect" msgstr "DSelect での APT" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:547 +#: apt.conf.5.xml:564 msgid "" "When APT is used as a &dselect; method several configuration directives " "control the default behaviour. These are in the <literal>DSelect</literal> " @@ -6955,13 +7051,13 @@ msgstr "" "設定項目で、デフォルトの動作を制御します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:551 +#: apt.conf.5.xml:568 msgid "Clean" msgstr "Clean" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:552 +#: apt.conf.5.xml:569 msgid "" "Cache Clean mode; this value may be one of always, prompt, auto, pre-auto " "and never. always and prompt will remove all packages from the cache after " @@ -6978,7 +7074,7 @@ msgstr "" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:561 +#: apt.conf.5.xml:578 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the install phase." @@ -6988,13 +7084,13 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:565 +#: apt.conf.5.xml:582 msgid "Updateoptions" msgstr "Updateoptions" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:566 +#: apt.conf.5.xml:583 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the update phase." @@ -7003,13 +7099,13 @@ msgstr "" "されます。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:570 +#: apt.conf.5.xml:587 msgid "PromptAfterUpdate" msgstr "PromptAfterUpdate" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:571 +#: apt.conf.5.xml:588 msgid "" "If true the [U]pdate operation in &dselect; will always prompt to continue. " "The default is to prompt only on error." @@ -7019,13 +7115,13 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:577 +#: apt.conf.5.xml:594 msgid "How APT calls dpkg" msgstr "APT が dpkg を呼ぶ方法" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:578 +#: apt.conf.5.xml:595 msgid "" "Several configuration directives control how APT invokes &dpkg;. These are " "in the <literal>DPkg</literal> section." @@ -7035,7 +7131,7 @@ msgstr "" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:583 +#: apt.conf.5.xml:600 msgid "" "This is a list of options to pass to dpkg. The options must be specified " "using the list notation and each list item is passed as a single argument to " @@ -7045,18 +7141,18 @@ msgstr "" "ければなりません。また、各リストは単一の引数として &dpkg; に渡されます。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:588 +#: apt.conf.5.xml:605 msgid "Pre-Invoke" msgstr "Pre-Invoke" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:588 +#: apt.conf.5.xml:605 msgid "Post-Invoke" msgstr "Post-Invoke" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:589 +#: apt.conf.5.xml:606 msgid "" "This is a list of shell commands to run before/after invoking &dpkg;. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -7070,13 +7166,13 @@ msgstr "" # type: <tag></tag> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:595 +#: apt.conf.5.xml:612 msgid "Pre-Install-Pkgs" msgstr "Pre-Install-Pkgs" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:596 +#: apt.conf.5.xml:613 msgid "" "This is a list of shell commands to run before invoking dpkg. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -7092,7 +7188,7 @@ msgstr "" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:602 +#: apt.conf.5.xml:619 msgid "" "Version 2 of this protocol dumps more information, including the protocol " "version, the APT configuration space and the packages, files and versions " @@ -7108,13 +7204,13 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><title> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:609 +#: apt.conf.5.xml:626 msgid "Run-Directory" msgstr "Run-Directory" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:610 +#: apt.conf.5.xml:627 msgid "" "APT chdirs to this directory before invoking dpkg, the default is <filename>/" "</filename>." @@ -7124,13 +7220,13 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:614 +#: apt.conf.5.xml:631 msgid "Build-options" msgstr "Build-options" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:615 +#: apt.conf.5.xml:632 msgid "" "These options are passed to &dpkg-buildpackage; when compiling packages, the " "default is to disable signing and produce all binaries." @@ -7139,12 +7235,12 @@ msgstr "" "ます。デフォルトでは署名を無効にし、全バイナリを生成します。" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt.conf.5.xml:620 +#: apt.conf.5.xml:637 msgid "dpkg trigger usage (and related options)" msgstr "dpkg トリガの使い方 (および関連オプション)" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:621 +#: apt.conf.5.xml:638 msgid "" "APT can call dpkg in a way so it can make aggressive use of triggers over " "multiple calls of dpkg. Without further options dpkg will use triggers only " @@ -7159,7 +7255,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> -#: apt.conf.5.xml:636 +#: apt.conf.5.xml:653 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@ -7173,7 +7269,7 @@ msgstr "" "DPkg::TriggersPending \"true\";" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:630 +#: apt.conf.5.xml:647 msgid "" "Note that it is not guaranteed that APT will support these options or that " "these options will not cause (big) trouble in the future. If you have " @@ -7187,12 +7283,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:642 +#: apt.conf.5.xml:659 msgid "DPkg::NoTriggers" msgstr "DPkg::NoTriggers" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:643 +#: apt.conf.5.xml:660 msgid "" "Add the no triggers flag to all dpkg calls (except the ConfigurePending " "call). See &dpkg; if you are interested in what this actually means. In " @@ -7205,12 +7301,12 @@ msgstr "" # type: <tag></tag> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:650 +#: apt.conf.5.xml:667 msgid "PackageManager::Configure" msgstr "PackageManager::Configure" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:651 +#: apt.conf.5.xml:668 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default " @@ -7227,12 +7323,12 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:661 +#: apt.conf.5.xml:678 msgid "DPkg::ConfigurePending" msgstr "DPkg::ConfigurePending" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:662 +#: apt.conf.5.xml:679 msgid "" "If this option is set apt will call <command>dpkg --configure --pending</" "command> to let dpkg handle all required configurations and triggers. This " @@ -7243,12 +7339,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:668 +#: apt.conf.5.xml:685 msgid "DPkg::TriggersPending" msgstr "DPkg::TriggersPending" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:669 +#: apt.conf.5.xml:686 msgid "" "Useful for <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal> and dpkg " @@ -7258,12 +7354,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:674 +#: apt.conf.5.xml:691 msgid "PackageManager::UnpackAll" msgstr "PackageManager::UnpackAll" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:675 +#: apt.conf.5.xml:692 msgid "" "As the configuration can be deferred to be done at the end by dpkg it can be " "tried to order the unpack series only by critical needs, e.g. by Pre-" @@ -7275,12 +7371,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:682 +#: apt.conf.5.xml:699 msgid "OrderList::Score::Immediate" msgstr "OrderList::Score::Immediate" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:690 +#: apt.conf.5.xml:707 #, no-wrap msgid "" "OrderList::Score {\n" @@ -7298,7 +7394,7 @@ msgstr "" "};" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:683 +#: apt.conf.5.xml:700 msgid "" "Essential packages (and there dependencies) should be configured immediately " "after unpacking. It will be a good idea to do this quite early in the " @@ -7312,12 +7408,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:703 +#: apt.conf.5.xml:720 msgid "Periodic and Archives options" msgstr "Periodic オプションと Archives オプション" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:704 +#: apt.conf.5.xml:721 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by " @@ -7331,12 +7427,12 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:712 +#: apt.conf.5.xml:729 msgid "Debug options" msgstr "デバッグオプション" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:714 +#: apt.conf.5.xml:731 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@ -7347,7 +7443,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:725 +#: apt.conf.5.xml:742 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</" @@ -7358,7 +7454,7 @@ msgstr "" "にします。" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:733 +#: apt.conf.5.xml:750 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s install</" @@ -7369,7 +7465,7 @@ msgstr "" "literal>) を行う場合に使用します。" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:742 +#: apt.conf.5.xml:759 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@ -7381,7 +7477,7 @@ msgstr "" #. motivating example, except I haven't a clue why you'd want #. to do this. #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:750 +#: apt.conf.5.xml:767 msgid "" "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " "in CDROM IDs." @@ -7390,59 +7486,59 @@ msgstr "" "を無効にします。" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:760 +#: apt.conf.5.xml:777 msgid "A full list of debugging options to apt follows." msgstr "以下は apt に対するデバッグオプションのすべてです。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:765 +#: apt.conf.5.xml:782 msgid "<literal>Debug::Acquire::cdrom</literal>" msgstr "<literal>Debug::Acquire::cdrom</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:769 +#: apt.conf.5.xml:786 msgid "" "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" "<literal>cdrom://</literal> ソースへのアクセスに関する情報を出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:776 +#: apt.conf.5.xml:793 msgid "<literal>Debug::Acquire::ftp</literal>" msgstr "<literal>Debug::Acquire::ftp</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:780 +#: apt.conf.5.xml:797 msgid "Print information related to downloading packages using FTP." msgstr "FTP を用いたパッケージのダウンロードに関する情報を出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:787 +#: apt.conf.5.xml:804 msgid "<literal>Debug::Acquire::http</literal>" msgstr "<literal>Debug::Acquire::http</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:791 +#: apt.conf.5.xml:808 msgid "Print information related to downloading packages using HTTP." msgstr "HTTP を用いたパッケージのダウンロードに関する情報を出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:798 +#: apt.conf.5.xml:815 msgid "<literal>Debug::Acquire::https</literal>" msgstr "<literal>Debug::Acquire::https</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:802 +#: apt.conf.5.xml:819 msgid "Print information related to downloading packages using HTTPS." msgstr "HTTPS を用いたパッケージのダウンロードに関する情報を出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:809 +#: apt.conf.5.xml:826 msgid "<literal>Debug::Acquire::gpgv</literal>" msgstr "<literal>Debug::Acquire::gpgv</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:813 +#: apt.conf.5.xml:830 msgid "" "Print information related to verifying cryptographic signatures using " "<literal>gpg</literal>." @@ -7450,12 +7546,12 @@ msgstr "" "<literal>gpg</literal> を用いた暗号署名の検証に関する情報を出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:820 +#: apt.conf.5.xml:837 msgid "<literal>Debug::aptcdrom</literal>" msgstr "<literal>Debug::aptcdrom</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:824 +#: apt.conf.5.xml:841 msgid "" "Output information about the process of accessing collections of packages " "stored on CD-ROMs." @@ -7464,22 +7560,22 @@ msgstr "" "します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:831 +#: apt.conf.5.xml:848 msgid "<literal>Debug::BuildDeps</literal>" msgstr "<literal>Debug::BuildDeps</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:834 +#: apt.conf.5.xml:851 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "&apt-get; での構築依存関係解決のプロセスを説明します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:841 +#: apt.conf.5.xml:858 msgid "<literal>Debug::Hashes</literal>" msgstr "<literal>Debug::Hashes</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:844 +#: apt.conf.5.xml:861 msgid "" "Output each cryptographic hash that is generated by the <literal>apt</" "literal> libraries." @@ -7487,12 +7583,12 @@ msgstr "" "<literal>apt</literal> ライブラリが生成した、暗号化ハッシュを出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:851 +#: apt.conf.5.xml:868 msgid "<literal>Debug::IdentCDROM</literal>" msgstr "<literal>Debug::IdentCDROM</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:854 +#: apt.conf.5.xml:871 msgid "" "Do not include information from <literal>statfs</literal>, namely the number " "of used and free blocks on the CD-ROM filesystem, when generating an ID for " @@ -7502,12 +7598,12 @@ msgstr "" "システムにある使用済・未使用ブロックの数からの情報を含めないようにします。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:862 +#: apt.conf.5.xml:879 msgid "<literal>Debug::NoLocking</literal>" msgstr "<literal>Debug::NoLocking</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:865 +#: apt.conf.5.xml:882 msgid "" "Disable all file locking. For instance, this will allow two instances of " "<quote><literal>apt-get update</literal></quote> to run at the same time." @@ -7516,23 +7612,23 @@ msgstr "" "<quote><literal>apt-get update</literal></quote> を実行できるようになります。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:873 +#: apt.conf.5.xml:890 msgid "<literal>Debug::pkgAcquire</literal>" msgstr "<literal>Debug::pkgAcquire</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:877 +#: apt.conf.5.xml:894 msgid "Log when items are added to or removed from the global download queue." msgstr "" "グローバルダウンロードキューに対する項目の追加・削除の際にログを出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:884 +#: apt.conf.5.xml:901 msgid "<literal>Debug::pkgAcquire::Auth</literal>" msgstr "<literal>Debug::pkgAcquire::Auth</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:887 +#: apt.conf.5.xml:904 msgid "" "Output status messages and errors related to verifying checksums and " "cryptographic signatures of downloaded files." @@ -7541,12 +7637,12 @@ msgstr "" "ジやエラーを出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:894 +#: apt.conf.5.xml:911 msgid "<literal>Debug::pkgAcquire::Diffs</literal>" msgstr "<literal>Debug::pkgAcquire::Diffs</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:897 +#: apt.conf.5.xml:914 msgid "" "Output information about downloading and applying package index list diffs, " "and errors relating to package index list diffs." @@ -7555,12 +7651,12 @@ msgstr "" "します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:905 +#: apt.conf.5.xml:922 msgid "<literal>Debug::pkgAcquire::RRed</literal>" msgstr "<literal>Debug::pkgAcquire::RRed</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:909 +#: apt.conf.5.xml:926 msgid "" "Output information related to patching apt package lists when downloading " "index diffs instead of full indices." @@ -7569,24 +7665,24 @@ msgstr "" "リストへのパッチ適用に関する情報を出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:916 +#: apt.conf.5.xml:933 msgid "<literal>Debug::pkgAcquire::Worker</literal>" msgstr "<literal>Debug::pkgAcquire::Worker</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:920 +#: apt.conf.5.xml:937 msgid "" "Log all interactions with the sub-processes that actually perform downloads." msgstr "" "実際のダウンロードを行う際の、サブプロセスとのやりとりをログに出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:927 +#: apt.conf.5.xml:944 msgid "<literal>Debug::pkgAutoRemove</literal>" msgstr "<literal>Debug::pkgAutoRemove</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:931 +#: apt.conf.5.xml:948 msgid "" "Log events related to the automatically-installed status of packages and to " "the removal of unused packages." @@ -7595,12 +7691,12 @@ msgstr "" "に出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:938 +#: apt.conf.5.xml:955 msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>" msgstr "<literal>Debug::pkgDepCache::AutoInstall</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:941 +#: apt.conf.5.xml:958 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial auto-" @@ -7615,12 +7711,12 @@ msgstr "" "路に対応しています。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:952 +#: apt.conf.5.xml:969 msgid "<literal>Debug::pkgDepCache::Marker</literal>" msgstr "<literal>Debug::pkgDepCache::Marker</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:955 +#: apt.conf.5.xml:972 msgid "" "Generate debug messages describing which package is marked as keep/install/" "remove while the ProblemResolver does his work. Each addition or deletion " @@ -7637,22 +7733,22 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:974 +#: apt.conf.5.xml:991 msgid "<literal>Debug::pkgInitConfig</literal>" msgstr "<literal>Debug::pkgInitConfig</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:977 +#: apt.conf.5.xml:994 msgid "Dump the default configuration to standard error on startup." msgstr "起動時に、標準エラー出力へデフォルト設定を出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:984 +#: apt.conf.5.xml:1001 msgid "<literal>Debug::pkgDPkgPM</literal>" msgstr "<literal>Debug::pkgDPkgPM</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:987 +#: apt.conf.5.xml:1004 msgid "" "When invoking &dpkg;, output the precise command line with which it is being " "invoked, with arguments separated by a single space character." @@ -7661,12 +7757,12 @@ msgstr "" "切られます。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:995 +#: apt.conf.5.xml:1012 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" msgstr "<literal>Debug::pkgDPkgProgressReporting</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:998 +#: apt.conf.5.xml:1015 msgid "" "Output all the data received from &dpkg; on the status file descriptor and " "any errors encountered while parsing it." @@ -7675,12 +7771,12 @@ msgstr "" "を解析中に発生したエラーを出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1005 +#: apt.conf.5.xml:1022 msgid "<literal>Debug::pkgOrderList</literal>" msgstr "<literal>Debug::pkgOrderList</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1009 +#: apt.conf.5.xml:1026 msgid "" "Generate a trace of the algorithm that decides the order in which " "<literal>apt</literal> should pass packages to &dpkg;." @@ -7689,33 +7785,33 @@ msgstr "" "のトレースを生成します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1017 +#: apt.conf.5.xml:1034 msgid "<literal>Debug::pkgPackageManager</literal>" msgstr "<literal>Debug::pkgPackageManager</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1021 +#: apt.conf.5.xml:1038 msgid "" "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "&dpkg; を呼び出す際に、実行手順を追跡した状態メッセージを出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1028 +#: apt.conf.5.xml:1045 msgid "<literal>Debug::pkgPolicy</literal>" msgstr "<literal>Debug::pkgPolicy</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1032 +#: apt.conf.5.xml:1049 msgid "Output the priority of each package list on startup." msgstr "起動時の各パッケージの優先度を表示します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1038 +#: apt.conf.5.xml:1055 msgid "<literal>Debug::pkgProblemResolver</literal>" msgstr "<literal>Debug::pkgProblemResolver</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1042 +#: apt.conf.5.xml:1059 msgid "" "Trace the execution of the dependency resolver (this applies only to what " "happens when a complex dependency problem is encountered)." @@ -7724,12 +7820,12 @@ msgstr "" "した場合にのみ、適用されます)。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1050 +#: apt.conf.5.xml:1067 msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>" msgstr "<literal>Debug::pkgProblemResolver::ShowScores</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1053 +#: apt.conf.5.xml:1070 msgid "" "Display a list of all installed packages with their calculated score used by " "the pkgProblemResolver. The description of the package is the same as " @@ -7737,12 +7833,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1061 +#: apt.conf.5.xml:1078 msgid "<literal>Debug::sourceList</literal>" msgstr "<literal>Debug::sourceList</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1065 +#: apt.conf.5.xml:1082 msgid "" "Print information about the vendors read from <filename>/etc/apt/vendors." "list</filename>." @@ -7752,7 +7848,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1088 +#: apt.conf.5.xml:1105 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." @@ -7762,14 +7858,14 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><variablelist> -#: apt.conf.5.xml:1095 +#: apt.conf.5.xml:1112 msgid "&file-aptconf;" msgstr "&file-aptconf;" # type: Content of: <refentry><refsect1><para> #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1100 +#: apt.conf.5.xml:1117 msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "&apt-cache;, &apt-config;, &apt-preferences;." @@ -9344,8 +9440,9 @@ msgstr "" #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml:81 -#, no-wrap -msgid "deb uri distribution [component1] [component2] [...]" +#, fuzzy, no-wrap +#| msgid "deb uri distribution [component1] [component2] [...]" +msgid "deb [ options ] uri distribution [component1] [component2] [...]" msgstr "deb uri distribution [component1] [component2] [...]" # type: Content of: <refentry><refsect1><para> @@ -9413,10 +9510,31 @@ msgstr "" "にアクセスするのに便利です。APT は、帯域の狭いサイトを効率よく扱うのに、異な" "るホストへは、接続を並行して行うようにもしています。" -# type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:112 msgid "" +"<literal>options</literal> is always optional and needs to be surounded by " +"square brackets. It can consist of multiple settings in the form " +"<literal><replaceable>setting</replaceable>=<replaceable>value</" +"replaceable></literal>. Multiple settings are separated by spaces. The " +"following settings are supported by APT, note though that unsupported " +"settings will be ignored silently:" +msgstr "" + +#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> +#: sources.list.5.xml:117 +msgid "" +"<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</" +"replaceable>,…</literal> can be used to specify for which architectures " +"packages information should be downloaded. If this option is not set all " +"architectures defined by the <literal>APT::Architectures</literal> option " +"will be downloaded." +msgstr "" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:123 +msgid "" "It is important to list sources in order of preference, with the most " "preferred source listed first. Typically this will result in sorting by " "speed from fastest to slowest (CD-ROM followed by hosts on a local network, " @@ -9429,12 +9547,12 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:117 +#: sources.list.5.xml:128 msgid "Some examples:" msgstr "例:" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:119 +#: sources.list.5.xml:130 #, no-wrap msgid "" "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n" @@ -9447,19 +9565,19 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> -#: sources.list.5.xml:125 +#: sources.list.5.xml:136 msgid "URI specification" msgstr "URI の仕様" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: sources.list.5.xml:130 +#: sources.list.5.xml:141 msgid "file" msgstr "ファイル" # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:132 +#: sources.list.5.xml:143 msgid "" "The file scheme allows an arbitrary directory in the file system to be " "considered an archive. This is useful for NFS mounts and local mirrors or " @@ -9470,7 +9588,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:139 +#: sources.list.5.xml:150 msgid "" "The cdrom scheme allows APT to use a local CDROM drive with media swapping. " "Use the &apt-cdrom; program to create cdrom entries in the source list." @@ -9481,7 +9599,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:146 +#: sources.list.5.xml:157 msgid "" "The http scheme specifies an HTTP server for the archive. If an environment " "variable <envar>http_proxy</envar> is set with the format http://server:" @@ -9498,7 +9616,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:157 +#: sources.list.5.xml:168 msgid "" "The ftp scheme specifies an FTP server for the archive. APT's FTP behavior " "is highly configurable; for more information see the &apt-conf; manual page. " @@ -9517,13 +9635,13 @@ msgstr "" "れます。" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: sources.list.5.xml:166 +#: sources.list.5.xml:177 msgid "copy" msgstr "copy" # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:168 +#: sources.list.5.xml:179 msgid "" "The copy scheme is identical to the file scheme except that packages are " "copied into the cache directory instead of used directly at their location. " @@ -9534,18 +9652,18 @@ msgstr "" "て、APT でコピーを行う場合に便利です。" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: sources.list.5.xml:173 +#: sources.list.5.xml:184 msgid "rsh" msgstr "rsh" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: sources.list.5.xml:173 +#: sources.list.5.xml:184 msgid "ssh" msgstr "ssh" # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:175 +#: sources.list.5.xml:186 msgid "" "The rsh/ssh method invokes rsh/ssh to connect to a remote host as a given " "user and access the files. It is a good idea to do prior arrangements with " @@ -9560,12 +9678,12 @@ msgstr "" "します。" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: sources.list.5.xml:183 +#: sources.list.5.xml:194 msgid "more recognizable URI types" msgstr "さらに認識できる URI タイプ" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:185 +#: sources.list.5.xml:196 msgid "" "APT can be extended with more methods shipped in other optional packages " "which should follow the nameing scheme <literal>apt-transport-" @@ -9579,7 +9697,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:127 +#: sources.list.5.xml:138 msgid "" "The currently recognized URI types are cdrom, file, http, ftp, copy, ssh, " "rsh. <placeholder type=\"variablelist\" id=\"0\"/>" @@ -9589,7 +9707,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:199 +#: sources.list.5.xml:210 msgid "" "Uses the archive stored locally (or NFS mounted) at /home/jason/debian for " "stable/main, stable/contrib, and stable/non-free." @@ -9598,38 +9716,61 @@ msgstr "" "free 用のローカル (または NFS) アーカイブを使用します。" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:201 +#: sources.list.5.xml:212 #, no-wrap msgid "deb file:/home/jason/debian stable main contrib non-free" msgstr "deb file:/home/jason/debian stable main contrib non-free" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:203 +#: sources.list.5.xml:214 msgid "As above, except this uses the unstable (development) distribution." msgstr "上記同様ですが、不安定版 (開発版) を使用します。" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:204 +#: sources.list.5.xml:215 #, no-wrap msgid "deb file:/home/jason/debian unstable main contrib non-free" msgstr "deb file:/home/jason/debian unstable main contrib non-free" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:206 +#: sources.list.5.xml:217 msgid "Source line for the above" msgstr "上記のソース行" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:207 +#: sources.list.5.xml:218 #, no-wrap msgid "deb-src file:/home/jason/debian unstable main contrib non-free" msgstr "deb-src file:/home/jason/debian unstable main contrib non-free" +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:220 +msgid "" +"The first line gets package information for the architectures in " +"<literal>APT::Architectures</literal> while the second always retrieves " +"<literal>amd64</literal> and <literal>armel</literal>." +msgstr "" + +#. type: Content of: <refentry><refsect1><literallayout> +#: sources.list.5.xml:222 +#, fuzzy, no-wrap +#| msgid "" +#| "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n" +#| "deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n" +#| " " +msgid "" +"deb http://ftp.debian.org/debian &stable-codename; main\n" +"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main" +msgstr "" +"deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n" +"deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n" +" " + # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:209 +#: sources.list.5.xml:225 msgid "" "Uses HTTP to access the archive at archive.debian.org, and uses only the " "hamm/main area." @@ -9639,14 +9780,14 @@ msgstr "" # type: <example></example> #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:211 +#: sources.list.5.xml:227 #, no-wrap msgid "deb http://archive.debian.org/debian-archive hamm main" msgstr "deb http://archive.debian.org/debian-archive hamm main" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:213 +#: sources.list.5.xml:229 msgid "" "Uses FTP to access the archive at ftp.debian.org, under the debian " "directory, and uses only the &stable-codename;/contrib area." @@ -9656,14 +9797,14 @@ msgstr "" # type: <example></example> #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:215 +#: sources.list.5.xml:231 #, no-wrap msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib" msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:217 +#: sources.list.5.xml:233 msgid "" "Uses FTP to access the archive at ftp.debian.org, under the debian " "directory, and uses only the unstable/contrib area. If this line appears as " @@ -9677,13 +9818,13 @@ msgstr "" # type: <example></example> #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:221 +#: sources.list.5.xml:237 #, no-wrap msgid "deb ftp://ftp.debian.org/debian unstable contrib" msgstr "deb ftp://ftp.debian.org/debian unstable contrib" #. type: Content of: <refentry><refsect1><para><literallayout> -#: sources.list.5.xml:230 +#: sources.list.5.xml:246 #, fuzzy, no-wrap #| msgid "deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/" msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/" @@ -9691,7 +9832,7 @@ msgstr "deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:223 +#: sources.list.5.xml:239 #, fuzzy #| msgid "" #| "Uses HTTP to access the archive at nonus.debian.org, under the debian-non-" @@ -9720,7 +9861,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:235 +#: sources.list.5.xml:251 msgid "&apt-cache; &apt-conf;" msgstr "&apt-cache; &apt-conf;" @@ -10908,6 +11049,14 @@ msgstr " # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade" msgid "Which will use the already fetched archives on the disc." msgstr "これで、disc にある取得済みのアーカイブを使用するようになります。" +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#~ msgid "" +#~ "Update the local keyring with the keyring of Debian archive keys and " +#~ "removes from the keyring the archive keys which are no longer valid." +#~ msgstr "" +#~ "Debian アーカイブキーで、ローカルキーリングを更新し、もう有効でないキーを" +#~ "キーリングから削除します。" + #~ msgid "<option>--md5</option>" #~ msgstr "<option>--md5</option>" diff --git a/doc/po/pl.po b/doc/po/pl.po index 5e84a7d9c..309fe2637 100644 --- a/doc/po/pl.po +++ b/doc/po/pl.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.25.3\n" -"POT-Creation-Date: 2011-06-28 16:42+0200\n" +"POT-Creation-Date: 2011-11-20 17:58+0100\n" "PO-Revision-Date: 2010-03-18 22:00+0100\n" "Last-Translator: Robert Luberda <robert@debian.org>\n" "Language-Team: <debian-l10n-polish@lists.debian.org>\n" @@ -787,7 +787,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:64 apt-cdrom.8.xml:50 apt-config.8.xml:50 -#: apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:114 +#: apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:121 #: apt-key.8.xml:38 apt-mark.8.xml:56 apt-secure.8.xml:43 #: apt-sortpkgs.1.xml:47 apt.conf.5.xml:42 apt_preferences.5.xml:36 #: sources.list.5.xml:36 @@ -810,7 +810,7 @@ msgstr "" # #. type: Content of: <refentry><refsect1><para> -#: apt-cache.8.xml:70 apt-get.8.xml:120 +#: apt-cache.8.xml:70 apt-get.8.xml:127 msgid "" "Unless the <option>-h</option>, or <option>--help</option> option is given, " "one of the commands below must be present." @@ -1335,8 +1335,8 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:278 apt-config.8.xml:96 apt-extracttemplates.1.xml:59 -#: apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:126 -#: apt-sortpkgs.1.xml:57 apt.conf.5.xml:560 apt.conf.5.xml:582 +#: apt-ftparchive.1.xml:525 apt-get.8.xml:342 apt-mark.8.xml:126 +#: apt-sortpkgs.1.xml:57 apt.conf.5.xml:577 apt.conf.5.xml:599 msgid "options" msgstr "opcje" @@ -1363,7 +1363,7 @@ msgstr "" "<literal>Dir::Cache::pkgcache</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:288 apt-ftparchive.1.xml:572 apt-get.8.xml:393 +#: apt-cache.8.xml:288 apt-ftparchive.1.xml:572 apt-get.8.xml:404 #: apt-sortpkgs.1.xml:61 msgid "<option>-s</option>" msgstr "<option>-s</option>" @@ -1391,12 +1391,12 @@ msgstr "" "Cache::srcpkgcache</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:383 +#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:394 msgid "<option>-q</option>" msgstr "<option>-q</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:383 +#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:394 msgid "<option>--quiet</option>" msgstr "<option>--quiet</option>" @@ -1514,7 +1514,7 @@ msgstr "" "konfiguracyjnym: <literal>APT::Cache::RecurseDepends</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:323 apt-cdrom.8.xml:124 apt-get.8.xml:350 +#: apt-cache.8.xml:323 apt-cdrom.8.xml:124 apt-get.8.xml:361 msgid "<option>-f</option>" msgstr "<option>-f</option>" @@ -1535,6 +1535,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:584 +#: apt-get.8.xml:447 msgid "<option>-a</option>" msgstr "<option>-a</option>" @@ -1660,14 +1661,14 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist> #: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101 -#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:612 apt-get.8.xml:570 +#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:612 apt-get.8.xml:591 #: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67 msgid "&apt-commonoptions;" msgstr "&apt-commonoptions;" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:172 apt-mark.8.xml:144 -#: apt.conf.5.xml:1093 apt_preferences.5.xml:697 +#: apt-cache.8.xml:372 apt-get.8.xml:596 apt-key.8.xml:175 apt-mark.8.xml:144 +#: apt.conf.5.xml:1110 apt_preferences.5.xml:697 msgid "Files" msgstr "Pliki" @@ -1678,10 +1679,10 @@ msgstr "&file-sourceslist; &file-statelists;" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106 -#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:628 apt-get.8.xml:585 -#: apt-key.8.xml:193 apt-mark.8.xml:150 apt-secure.8.xml:185 -#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:704 -#: sources.list.5.xml:234 +#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:628 apt-get.8.xml:606 +#: apt-key.8.xml:196 apt-mark.8.xml:150 apt-secure.8.xml:185 +#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1116 apt_preferences.5.xml:704 +#: sources.list.5.xml:250 msgid "See Also" msgstr "Zobacz także" @@ -1693,7 +1694,7 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111 -#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:632 apt-get.8.xml:591 +#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:632 apt-get.8.xml:612 #: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76 msgid "Diagnostics" msgstr "Diagnostyka" @@ -1837,12 +1838,12 @@ msgstr "" "\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><title> -#: apt-cdrom.8.xml:94 apt-key.8.xml:158 +#: apt-cdrom.8.xml:94 apt-key.8.xml:161 msgid "Options" msgstr "Opcje" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:540 apt-get.8.xml:345 +#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:540 apt-get.8.xml:356 msgid "<option>-d</option>" msgstr "<option>-d</option>" @@ -1888,7 +1889,7 @@ msgstr "" "CDROM::Rename</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cdrom.8.xml:116 apt-get.8.xml:364 +#: apt-cdrom.8.xml:116 apt-get.8.xml:375 msgid "<option>-m</option>" msgstr "<option>-m</option>" @@ -1948,17 +1949,17 @@ msgstr "" "znajdzie wszystkie takie pliki." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cdrom.8.xml:143 apt-get.8.xml:395 +#: apt-cdrom.8.xml:143 apt-get.8.xml:406 msgid "<option>--just-print</option>" msgstr "<option>--just-print</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cdrom.8.xml:144 apt-get.8.xml:397 +#: apt-cdrom.8.xml:144 apt-get.8.xml:408 msgid "<option>--recon</option>" msgstr "<option>--recon</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cdrom.8.xml:145 apt-get.8.xml:398 +#: apt-cdrom.8.xml:145 apt-get.8.xml:409 msgid "<option>--no-act</option>" msgstr "<option>--no-act</option>" @@ -2183,7 +2184,7 @@ msgstr "" "config.XXXX</filename>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-extracttemplates.1.xml:63 apt-get.8.xml:504 +#: apt-extracttemplates.1.xml:63 apt-get.8.xml:525 msgid "<option>-t</option>" msgstr "<option>-t</option>" @@ -2432,7 +2433,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:145 apt-get.8.xml:287 +#: apt-ftparchive.1.xml:145 apt-get.8.xml:298 msgid "clean" msgstr "clean" @@ -2901,8 +2902,8 @@ msgid "" "free</literal>" msgstr "" -#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:394 +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:394 apt.conf.5.xml:157 msgid "Architectures" msgstr "" @@ -3276,8 +3277,8 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:617 apt.conf.5.xml:1087 apt_preferences.5.xml:544 -#: sources.list.5.xml:198 +#: apt-ftparchive.1.xml:617 apt.conf.5.xml:1104 apt_preferences.5.xml:544 +#: sources.list.5.xml:209 msgid "Examples" msgstr "Przykłady" @@ -3367,10 +3368,11 @@ msgid "" "<option>-o= <replaceable>config_string</replaceable> </option> </arg> <arg> " "<option>-c= <replaceable>config_file</replaceable> </option> </arg> <arg> " "<option>-t=</option> <arg choice='plain'> <replaceable>target_release</" -"replaceable> </arg> </arg> <group choice=\"req\"> <arg " -"choice='plain'>update</arg> <arg choice='plain'>upgrade</arg> <arg " -"choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-upgrade</arg> " -"<arg choice='plain'>install <arg choice=\"plain\" rep=\"repeat" +"replaceable> </arg> </arg> <arg> <option>-a=</option> <arg choice='plain'> " +"<replaceable>default_architecture</replaceable> </arg> </arg> <group choice=" +"\"req\"> <arg choice='plain'>update</arg> <arg choice='plain'>upgrade</arg> " +"<arg choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-upgrade</" +"arg> <arg choice='plain'>install <arg choice=\"plain\" rep=\"repeat" "\"><replaceable>pkg</replaceable> <arg> <group choice='req'> <arg " "choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> <arg " "choice='plain'> /<replaceable>target_release</replaceable> </arg> </group> </" @@ -3424,7 +3426,7 @@ msgstr "" # #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:115 +#: apt-get.8.xml:122 #, fuzzy #| msgid "" #| "<command>apt-get</command> is the command-line tool for handling " @@ -3444,13 +3446,13 @@ msgstr "" "&wajig;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:124 apt-key.8.xml:127 +#: apt-get.8.xml:131 apt-key.8.xml:127 msgid "update" msgstr "update" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:125 +#: apt-get.8.xml:132 msgid "" "<literal>update</literal> is used to resynchronize the package index files " "from their sources. The indexes of available packages are fetched from the " @@ -3474,13 +3476,13 @@ msgstr "" "<filename>Packages.gz</filename> nie jest wcześniej znany." #. type: <tag></tag> -#: apt-get.8.xml:136 guide.sgml:121 +#: apt-get.8.xml:143 guide.sgml:121 msgid "upgrade" msgstr "upgrade" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:137 +#: apt-get.8.xml:144 msgid "" "<literal>upgrade</literal> is used to install the newest versions of all " "packages currently installed on the system from the sources enumerated in " @@ -3505,13 +3507,13 @@ msgstr "" "wcześniej wykonać <literal>update</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:149 +#: apt-get.8.xml:156 msgid "dselect-upgrade" msgstr "dselect-upgrade" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:150 +#: apt-get.8.xml:157 msgid "" "<literal>dselect-upgrade</literal> is used in conjunction with the " "traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</" @@ -3529,13 +3531,13 @@ msgstr "" "nowych)." #. type: <tag></tag> -#: apt-get.8.xml:159 guide.sgml:140 +#: apt-get.8.xml:166 guide.sgml:140 msgid "dist-upgrade" msgstr "dist-upgrade" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:160 +#: apt-get.8.xml:167 msgid "" "<literal>dist-upgrade</literal> in addition to performing the function of " "<literal>upgrade</literal>, also intelligently handles changing dependencies " @@ -3559,13 +3561,13 @@ msgstr "" "poszczególnych pakietów." #. type: <tag></tag> -#: apt-get.8.xml:172 guide.sgml:131 +#: apt-get.8.xml:179 guide.sgml:131 msgid "install" msgstr "install" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:174 +#: apt-get.8.xml:181 msgid "" "<literal>install</literal> is followed by one or more packages desired for " "installation or upgrading. Each package is a package name, not a fully " @@ -3595,7 +3597,7 @@ msgstr "" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:192 +#: apt-get.8.xml:199 msgid "" "A specific version of a package can be selected for installation by " "following the package name with an equals and the version of the package to " @@ -3613,7 +3615,7 @@ msgstr "" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:199 +#: apt-get.8.xml:206 msgid "" "Both of the version selection mechanisms can downgrade packages and must be " "used with care." @@ -3623,7 +3625,7 @@ msgstr "" "ostrożnie." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:202 +#: apt-get.8.xml:209 msgid "" "This is also the target to use if you want to upgrade one or more already-" "installed packages without upgrading every package you have on your system. " @@ -3644,7 +3646,7 @@ msgstr "" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:213 +#: apt-get.8.xml:220 msgid "" "Finally, the &apt-preferences; mechanism allows you to create an alternative " "installation policy for individual packages." @@ -3654,7 +3656,7 @@ msgstr "" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:217 +#: apt-get.8.xml:224 msgid "" "If no package matches the given expression and the expression contains one " "of '.', '?' or '*' then it is assumed to be a POSIX regular expression, and " @@ -3675,13 +3677,13 @@ msgstr "" "lub \"$\", można też stworzyć bardziej specyficzne wyrażenie regularne." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:226 +#: apt-get.8.xml:233 msgid "remove" msgstr "remove" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:227 +#: apt-get.8.xml:234 msgid "" "<literal>remove</literal> is identical to <literal>install</literal> except " "that packages are removed instead of installed. Note the removing a package " @@ -3695,12 +3697,12 @@ msgstr "" "pakiet zostanie zainstalowany zamiast zostać usunięty." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:234 +#: apt-get.8.xml:241 msgid "purge" msgstr "purge" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:235 +#: apt-get.8.xml:242 msgid "" "<literal>purge</literal> is identical to <literal>remove</literal> except " "that packages are removed and purged (any configuration files are deleted " @@ -3711,13 +3713,13 @@ msgstr "" "wszystkie pliki konfiguracyjne)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:239 +#: apt-get.8.xml:246 msgid "source" msgstr "source" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:240 +#: apt-get.8.xml:247 msgid "" "<literal>source</literal> causes <command>apt-get</command> to fetch source " "packages. APT will examine the available packages to decide which source " @@ -3737,7 +3739,7 @@ msgstr "" "wydanie</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:248 +#: apt-get.8.xml:255 msgid "" "Source packages are tracked separately from binary packages via <literal>deb-" "src</literal> type lines in the &sources-list; file. This means that you " @@ -3753,12 +3755,19 @@ msgstr "" "jest zainstalowana lub możliwa do zainstalowania." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:255 +#: apt-get.8.xml:262 +#, fuzzy +#| msgid "" +#| "If the <option>--compile</option> option is specified then the package " +#| "will be compiled to a binary .deb using <command>dpkg-buildpackage</" +#| "command>, if <option>--download-only</option> is specified then the " +#| "source package will not be unpacked." msgid "" "If the <option>--compile</option> option is specified then the package will " -"be compiled to a binary .deb using <command>dpkg-buildpackage</command>, if " -"<option>--download-only</option> is specified then the source package will " -"not be unpacked." +"be compiled to a binary .deb using <command>dpkg-buildpackage</command> for " +"the architecture as defined by the <command>--host-architecture</command> " +"option. If <option>--download-only</option> is specified then the source " +"package will not be unpacked." msgstr "" "Jeżeli podano opcję <option>--compile</option>, to pakiet źródłowy zostanie " "skompilowany do pakietu binarnego .deb za pomocą programu <command>dpkg-" @@ -3767,7 +3776,7 @@ msgstr "" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:260 +#: apt-get.8.xml:269 msgid "" "A specific source version can be retrieved by postfixing the source name " "with an equals and then the version to fetch, similar to the mechanism used " @@ -3783,7 +3792,7 @@ msgstr "" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:266 +#: apt-get.8.xml:275 msgid "" "Note that source packages are not tracked like binary packages, they exist " "only in the current directory and are similar to downloading source tar " @@ -3794,29 +3803,36 @@ msgstr "" "ściągnięte oryginalne źródła programu ze strony jego autorów." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:271 +#: apt-get.8.xml:280 msgid "build-dep" msgstr "build-dep" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:272 +#: apt-get.8.xml:281 +#, fuzzy +#| msgid "" +#| "<literal>build-dep</literal> causes apt-get to install/remove packages in " +#| "an attempt to satisfy the build dependencies for a source package." msgid "" "<literal>build-dep</literal> causes apt-get to install/remove packages in an " -"attempt to satisfy the build dependencies for a source package." +"attempt to satisfy the build dependencies for a source package. By default " +"the dependencies are satisfied to build the package natively. If desired a " +"host-architecture can be specified with the <option>--host-architecture</" +"option> option instead." msgstr "" "<literal>build-dep</literal> powoduje, że apt-get zainstaluje/usunie pakiety " "tak, żeby spełnić zależności wymagane do zbudowania danego pakietu " "źródłowego." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:276 +#: apt-get.8.xml:287 msgid "check" msgstr "check" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:277 +#: apt-get.8.xml:288 msgid "" "<literal>check</literal> is a diagnostic tool; it updates the package cache " "and checks for broken dependencies." @@ -3825,12 +3841,12 @@ msgstr "" "bufor (cache) pakietów i szuka zepsutych pakietów." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:281 +#: apt-get.8.xml:292 msgid "download" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:282 +#: apt-get.8.xml:293 msgid "" "<literal>download</literal> will download the given binary package into the " "current directory." @@ -3838,7 +3854,7 @@ msgstr "" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:288 +#: apt-get.8.xml:299 msgid "" "<literal>clean</literal> clears out the local repository of retrieved " "package files. It removes everything but the lock file from " @@ -3857,13 +3873,13 @@ msgstr "" "literal>, aby zwolnić trochę miejsca na dysku." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:297 +#: apt-get.8.xml:308 msgid "autoclean" msgstr "autoclean" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:298 +#: apt-get.8.xml:309 msgid "" "Like <literal>clean</literal>, <literal>autoclean</literal> clears out the " "local repository of retrieved package files. The difference is that it only " @@ -3883,28 +3899,33 @@ msgstr "" "zawierających zainstalowane pakiety." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:307 +#: apt-get.8.xml:318 msgid "autoremove" msgstr "autoremove" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:308 +#: apt-get.8.xml:319 +#, fuzzy +#| msgid "" +#| "<literal>autoremove</literal> is used to remove packages that were " +#| "automatically installed to satisfy dependencies for some package and that " +#| "are no more needed." msgid "" "<literal>autoremove</literal> is used to remove packages that were " -"automatically installed to satisfy dependencies for some package and that " -"are no more needed." +"automatically installed to satisfy dependencies for other packages and are " +"now no longer needed." msgstr "" "<literal>autoremove</literal> jest używane do usuwania pakietów, które " "zostały zainstalowane automatycznie, żeby rozwiązać zależności, i nie są już " "potrzebne." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:312 +#: apt-get.8.xml:323 msgid "changelog" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:313 +#: apt-get.8.xml:324 msgid "" "<literal>changelog</literal> downloads a package changelog and displays it " "through <command>sensible-pager</command>. The server name and base " @@ -3917,12 +3938,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:335 +#: apt-get.8.xml:346 msgid "<option>--no-install-recommends</option>" msgstr "<option>--no-install-recommends</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:336 +#: apt-get.8.xml:347 msgid "" "Do not consider recommended packages as a dependency for installing. " "Configuration Item: <literal>APT::Install-Recommends</literal>." @@ -3931,14 +3952,14 @@ msgstr "" "Pozycja w pliku konfiguracyjnym: <literal>APT::Install-Recommends</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:340 +#: apt-get.8.xml:351 #, fuzzy #| msgid "<option>--no-upgrade</option>" msgid "<option>--install-suggests</option>" msgstr "<option>--no-upgrade</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:341 +#: apt-get.8.xml:352 #, fuzzy #| msgid "" #| "Do not consider recommended packages as a dependency for installing. " @@ -3951,13 +3972,13 @@ msgstr "" "Pozycja w pliku konfiguracyjnym: <literal>APT::Install-Recommends</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:345 +#: apt-get.8.xml:356 msgid "<option>--download-only</option>" msgstr "<option>--download-only</option>" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:346 +#: apt-get.8.xml:357 msgid "" "Download only; package files are only retrieved, not unpacked or installed. " "Configuration Item: <literal>APT::Get::Download-Only</literal>." @@ -3967,13 +3988,13 @@ msgstr "" "Download-Only</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:350 +#: apt-get.8.xml:361 msgid "<option>--fix-broken</option>" msgstr "<option>--fix-broken</option>" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:351 +#: apt-get.8.xml:362 msgid "" "Fix; attempt to correct a system with broken dependencies in place. This " "option, when used with install/remove, can omit any packages to permit APT " @@ -4000,18 +4021,18 @@ msgstr "" "konfiguracyjnym: <literal>APT::Get::Fix-Broken</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:364 +#: apt-get.8.xml:375 msgid "<option>--ignore-missing</option>" msgstr "<option>--ignore-missing</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:365 +#: apt-get.8.xml:376 msgid "<option>--fix-missing</option>" msgstr "<option>--fix-missing</option>" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:366 +#: apt-get.8.xml:377 msgid "" "Ignore missing packages; If packages cannot be retrieved or fail the " "integrity check after retrieval (corrupted package files), hold back those " @@ -4030,13 +4051,13 @@ msgstr "" "konfiguracyjnym: <literal>APT::Get::Fix-Missing</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:376 +#: apt-get.8.xml:387 msgid "<option>--no-download</option>" msgstr "<option>--no-download</option>" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:377 +#: apt-get.8.xml:388 msgid "" "Disables downloading of packages. This is best used with <option>--ignore-" "missing</option> to force APT to use only the .debs it has already " @@ -4049,7 +4070,7 @@ msgstr "" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:384 +#: apt-get.8.xml:395 msgid "" "Quiet; produces output suitable for logging, omitting progress indicators. " "More q's will produce more quiet up to a maximum of 2. You can also use " @@ -4069,18 +4090,18 @@ msgstr "" "spodziewa. Pozycja w pliku konfiguracyjnym: <literal>quiet</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:394 +#: apt-get.8.xml:405 msgid "<option>--simulate</option>" msgstr "<option>--simulate</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:396 +#: apt-get.8.xml:407 msgid "<option>--dry-run</option>" msgstr "<option>--dry-run</option>" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:399 +#: apt-get.8.xml:410 msgid "" "No action; perform a simulation of events that would occur but do not " "actually change the system. Configuration Item: <literal>APT::Get::" @@ -4091,7 +4112,7 @@ msgstr "" "Get::Simulate</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:403 +#: apt-get.8.xml:414 msgid "" "Simulation run as user will deactivate locking (<literal>Debug::NoLocking</" "literal>) automatic. Also a notice will be displayed indicating that this " @@ -4111,7 +4132,7 @@ msgstr "" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:409 +#: apt-get.8.xml:420 msgid "" "Simulate prints out a series of lines each one representing a dpkg " "operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square brackets " @@ -4125,23 +4146,23 @@ msgstr "" "znana (rzadkość)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:416 +#: apt-get.8.xml:427 msgid "<option>-y</option>" msgstr "<option>-y</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:416 +#: apt-get.8.xml:427 msgid "<option>--yes</option>" msgstr "<option>--yes</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:417 +#: apt-get.8.xml:428 msgid "<option>--assume-yes</option>" msgstr "<option>--assume-yes</option>" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:418 +#: apt-get.8.xml:429 msgid "" "Automatic yes to prompts; assume \"yes\" as answer to all prompts and run " "non-interactively. If an undesirable situation, such as changing a held " @@ -4157,18 +4178,18 @@ msgstr "" "Assume-Yes</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:425 +#: apt-get.8.xml:436 msgid "<option>-u</option>" msgstr "<option>-u</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:425 +#: apt-get.8.xml:436 msgid "<option>--show-upgraded</option>" msgstr "<option>--show-upgraded</option>" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:426 +#: apt-get.8.xml:437 msgid "" "Show upgraded packages; Print out a list of all packages that are to be " "upgraded. Configuration Item: <literal>APT::Get::Show-Upgraded</literal>." @@ -4178,18 +4199,18 @@ msgstr "" "Upgraded</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:431 +#: apt-get.8.xml:442 msgid "<option>-V</option>" msgstr "<option>-V</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:431 +#: apt-get.8.xml:442 msgid "<option>--verbose-versions</option>" msgstr "<option>--verbose-versions</option>" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:432 +#: apt-get.8.xml:443 msgid "" "Show full versions for upgraded and installed packages. Configuration Item: " "<literal>APT::Get::Show-Versions</literal>." @@ -4198,23 +4219,41 @@ msgstr "" "konfiguracyjnym: <literal>APT::Get::Show-Versions</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:436 +#: apt-get.8.xml:448 +#, fuzzy +#| msgid "<option>--recurse</option>" +msgid "<option>--host-architecture</option>" +msgstr "<option>--recurse</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:449 +msgid "" +"This option controls the architecture packages are built for by <command>apt-" +"get source --compile</command> and how cross-builddependencies are " +"satisfied. By default is it not set which means that the host architecture " +"is the same as the build architecture (which is defined by <literal>APT::" +"Architecture</literal>). Configuration Item: <literal>APT::Get::Host-" +"Architecture</literal>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:457 msgid "<option>-b</option>" msgstr "<option>-b</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:436 +#: apt-get.8.xml:457 msgid "<option>--compile</option>" msgstr "<option>--compile</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:437 +#: apt-get.8.xml:458 msgid "<option>--build</option>" msgstr "<option>--build</option>" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:438 +#: apt-get.8.xml:459 msgid "" "Compile source packages after downloading them. Configuration Item: " "<literal>APT::Get::Compile</literal>." @@ -4223,13 +4262,13 @@ msgstr "" "konfiguracyjnym: <literal>APT::Get::Compile</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:442 +#: apt-get.8.xml:463 msgid "<option>--ignore-hold</option>" msgstr "<option>--ignore-hold</option>" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:443 +#: apt-get.8.xml:464 msgid "" "Ignore package Holds; This causes <command>apt-get</command> to ignore a " "hold placed on a package. This may be useful in conjunction with " @@ -4243,13 +4282,13 @@ msgstr "" "<literal>APT::Ignore-Hold</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:449 +#: apt-get.8.xml:470 msgid "<option>--no-upgrade</option>" msgstr "<option>--no-upgrade</option>" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:450 +#: apt-get.8.xml:471 msgid "" "Do not upgrade packages; When used in conjunction with <literal>install</" "literal>, <literal>no-upgrade</literal> will prevent packages on the command " @@ -4262,7 +4301,7 @@ msgstr "" "<literal>APT::Get::Upgrade</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:456 +#: apt-get.8.xml:477 #, fuzzy #| msgid "<option>--no-upgrade</option>" msgid "<option>--only-upgrade</option>" @@ -4270,7 +4309,7 @@ msgstr "<option>--no-upgrade</option>" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:457 +#: apt-get.8.xml:478 #, fuzzy #| msgid "" #| "Do not upgrade packages; When used in conjunction with <literal>install</" @@ -4289,13 +4328,13 @@ msgstr "" "<literal>APT::Get::Upgrade</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:463 +#: apt-get.8.xml:484 msgid "<option>--force-yes</option>" msgstr "<option>--force-yes</option>" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:464 +#: apt-get.8.xml:485 msgid "" "Force yes; This is a dangerous option that will cause apt to continue " "without prompting if it is doing something potentially harmful. It should " @@ -4311,13 +4350,13 @@ msgstr "" "force-yes</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:471 +#: apt-get.8.xml:492 msgid "<option>--print-uris</option>" msgstr "<option>--print-uris</option>" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:472 +#: apt-get.8.xml:493 msgid "" "Instead of fetching the files to install their URIs are printed. Each URI " "will have the path, the destination file name, the size and the expected md5 " @@ -4339,13 +4378,13 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:482 +#: apt-get.8.xml:503 msgid "<option>--purge</option>" msgstr "<option>--purge</option>" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:483 +#: apt-get.8.xml:504 msgid "" "Use purge instead of remove for anything that would be removed. An asterisk " "(\"*\") will be displayed next to packages which are scheduled to be purged. " @@ -4359,13 +4398,13 @@ msgstr "" "pliku konfiguracyjnym: <literal>APT::Get::Purge</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:490 +#: apt-get.8.xml:511 msgid "<option>--reinstall</option>" msgstr "<option>--reinstall</option>" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:491 +#: apt-get.8.xml:512 msgid "" "Re-Install packages that are already installed and at the newest version. " "Configuration Item: <literal>APT::Get::ReInstall</literal>." @@ -4374,13 +4413,13 @@ msgstr "" "Pozycja w pliku konfiguracyjnym: <literal>APT::Get::ReInstall</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:495 +#: apt-get.8.xml:516 msgid "<option>--list-cleanup</option>" msgstr "<option>--list-cleanup</option>" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:496 +#: apt-get.8.xml:517 msgid "" "This option defaults to on, use <literal>--no-list-cleanup</literal> to turn " "it off. When on <command>apt-get</command> will automatically manage the " @@ -4397,18 +4436,18 @@ msgstr "" "konfiguracyjnym: <literal>APT::Get::List-Cleanup</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:505 +#: apt-get.8.xml:526 msgid "<option>--target-release</option>" msgstr "<option>--target-release</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:506 +#: apt-get.8.xml:527 msgid "<option>--default-release</option>" msgstr "<option>--default-release</option>" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:507 +#: apt-get.8.xml:528 msgid "" "This option controls the default input to the policy engine, it creates a " "default pin at priority 990 using the specified release string. This " @@ -4431,13 +4470,13 @@ msgstr "" "stronę podręcznika &apt-preferences;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:520 +#: apt-get.8.xml:541 msgid "<option>--trivial-only</option>" msgstr "<option>--trivial-only</option>" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:522 +#: apt-get.8.xml:543 msgid "" "Only perform operations that are 'trivial'. Logically this can be considered " "related to <option>--assume-yes</option>, where <option>--assume-yes</" @@ -4451,13 +4490,13 @@ msgstr "" "Get::Trivial-Only</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:528 +#: apt-get.8.xml:549 msgid "<option>--no-remove</option>" msgstr "<option>--no-remove</option>" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:529 +#: apt-get.8.xml:550 msgid "" "If any packages are to be removed apt-get immediately aborts without " "prompting. Configuration Item: <literal>APT::Get::Remove</literal>." @@ -4467,12 +4506,12 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:534 +#: apt-get.8.xml:555 msgid "<option>--auto-remove</option>" msgstr "<option>--auto-remove</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:535 +#: apt-get.8.xml:556 msgid "" "If the command is either <literal>install</literal> or <literal>remove</" "literal>, then this option acts like running <literal>autoremove</literal> " @@ -4486,13 +4525,13 @@ msgstr "" "AutomaticRemove</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:541 +#: apt-get.8.xml:562 msgid "<option>--only-source</option>" msgstr "<option>--only-source</option>" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:542 +#: apt-get.8.xml:563 msgid "" "Only has meaning for the <literal>source</literal> and <literal>build-dep</" "literal> commands. Indicates that the given source names are not to be " @@ -4511,23 +4550,23 @@ msgstr "" "Only-Source</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:552 +#: apt-get.8.xml:573 msgid "<option>--diff-only</option>" msgstr "<option>--diff-only</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:552 +#: apt-get.8.xml:573 msgid "<option>--dsc-only</option>" msgstr "<option>--dsc-only</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:552 +#: apt-get.8.xml:573 msgid "<option>--tar-only</option>" msgstr "<option>--tar-only</option>" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:553 +#: apt-get.8.xml:574 msgid "" "Download only the diff, dsc, or tar file of a source archive. Configuration " "Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</" @@ -4538,13 +4577,13 @@ msgstr "" "Dsc-Only</literal> oraz <literal>APT::Get::Tar-Only</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:558 +#: apt-get.8.xml:579 msgid "<option>--arch-only</option>" msgstr "<option>--arch-only</option>" # #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:559 +#: apt-get.8.xml:580 msgid "" "Only process architecture-dependent build-dependencies. Configuration Item: " "<literal>APT::Get::Arch-Only</literal>." @@ -4555,12 +4594,12 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:563 +#: apt-get.8.xml:584 msgid "<option>--allow-unauthenticated</option>" msgstr "<option>--allow-unauthenticated</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:564 +#: apt-get.8.xml:585 msgid "" "Ignore if packages can't be authenticated and don't prompt about it. This " "is useful for tools like pbuilder. Configuration Item: <literal>APT::Get::" @@ -4571,7 +4610,7 @@ msgstr "" "w pliku konfiguracyjnym: <literal>APT::Get::AllowUnauthenticated</literal>." #. type: Content of: <refentry><refsect1><variablelist> -#: apt-get.8.xml:577 +#: apt-get.8.xml:598 msgid "" "&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; " "&file-statelists;" @@ -4581,7 +4620,7 @@ msgstr "" # #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:586 +#: apt-get.8.xml:607 msgid "" "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, " "&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-" @@ -4593,7 +4632,7 @@ msgstr "" # #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:592 +#: apt-get.8.xml:613 msgid "" "<command>apt-get</command> returns zero on normal operation, decimal 100 on " "error." @@ -4602,22 +4641,22 @@ msgstr "" "w przypadku błędu." #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:595 +#: apt-get.8.xml:616 msgid "ORIGINAL AUTHORS" msgstr "AUTORZY ORYGINAŁU" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:596 +#: apt-get.8.xml:617 msgid "&apt-author.jgunthorpe;" msgstr "&apt-author.jgunthorpe;" #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:599 +#: apt-get.8.xml:620 msgid "CURRENT AUTHORS" msgstr "OBECNI AUTORZY" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:601 +#: apt-get.8.xml:622 msgid "&apt-author.team;" msgstr "&apt-author.team;" @@ -4747,30 +4786,33 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:131 msgid "" -"Update the local keyring with the keyring of Debian archive keys and removes " -"from the keyring the archive keys which are no longer valid." +"Update the local keyring with the archive keyring and remove from the local " +"keyring the archive keys which are no longer valid. The archive keyring is " +"shipped in the <literal>archive-keyring</literal> package of your " +"distribution, e.g. the <literal>debian-archive-keyring</literal> package in " +"Debian." msgstr "" -"Aktualizuje lokalną składnicę kluczy używając składnicy kluczy archiwum " -"Debiana i usuwa z lokalnej składnicy nieaktualne już klucze archiwów Debiana." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:140 +#: apt-key.8.xml:141 #, fuzzy #| msgid "update" msgid "net-update" msgstr "update" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:144 +#: apt-key.8.xml:145 msgid "" -"Update the local keyring with the keys of a key server and removes from the " -"keyring the archive keys which are no longer valid. This requires an " -"installed wget and an APT build configured to have a server to fetch from. " -"APT in Debian does not support this command, but Ubuntu's APT does." +"Work similar to the <command>update</command> command above, but get the " +"archive keyring from an URI instead and validate it against a master key. " +"This requires an installed &wget; and an APT build configured to have a " +"server to fetch from and a master keyring to validate. APT in Debian does " +"not support this command and relies on <command>update</command> instead, " +"but Ubuntu's APT does." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-key.8.xml:159 +#: apt-key.8.xml:162 msgid "" "Note that options need to be defined before the commands described in the " "previous section." @@ -4779,17 +4821,17 @@ msgstr "" "opisanymi w poprzednim rozdziale." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:161 +#: apt-key.8.xml:164 msgid "--keyring <replaceable>filename</replaceable>" msgstr "--keyring <replaceable>nazwa_pliku</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:162 +#: apt-key.8.xml:165 msgid "" "With this option it is possible to specify a specific keyring file the " "command should operate on. The default is that a command is executed on the " "<filename>trusted.gpg</filename> file as well as on all parts in the " -"<filename>trusted.gpg.d</filename> directory, through <filename>trusted.gpg</" +"<filename>trusted.gpg.d</filename> directory, though <filename>trusted.gpg</" "filename> is the primary keyring which means that e.g. new keys are added to " "this one." msgstr "" @@ -4800,44 +4842,44 @@ msgstr "" "kluczy, co oznacza na przykład to, że nowe klucze będą dodawane właśnie tam." #. type: Content of: <refentry><refsect1><variablelist> -#: apt-key.8.xml:175 +#: apt-key.8.xml:178 msgid "&file-trustedgpg;" msgstr "&file-trustedgpg;" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:177 +#: apt-key.8.xml:180 msgid "<filename>/etc/apt/trustdb.gpg</filename>" msgstr "<filename>/etc/apt/trustdb.gpg</filename>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:178 +#: apt-key.8.xml:181 msgid "Local trust database of archive keys." msgstr "Lokalna składnica zaufanych kluczy archiwum." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:181 +#: apt-key.8.xml:184 msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:182 +#: apt-key.8.xml:185 msgid "Keyring of Debian archive trusted keys." msgstr "Składnica zaufanych kluczy archiwum Debiana." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:185 +#: apt-key.8.xml:188 msgid "" "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" msgstr "" "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:186 +#: apt-key.8.xml:189 msgid "Keyring of Debian archive removed trusted keys." msgstr "Składnica usuniętych zaufanych kluczy archiwum Debiana." #. type: Content of: <refentry><refsect1><para> -#: apt-key.8.xml:195 +#: apt-key.8.xml:198 msgid "&apt-get;, &apt-secure;" msgstr "&apt-get;, &apt-secure;" @@ -5655,13 +5697,24 @@ msgid "" "compiled for." msgstr "" +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:158 +msgid "" +"All Architectures the system supports. Processors implementing the " +"<literal>amd64</literal> are e.g. also able to execute binaries compiled for " +"<literal>i386</literal>; This list is use when fetching files and parsing " +"package lists. The internal default is always the native architecture " +"(<literal>APT::Architecture</literal>) and all foreign architectures it can " +"retrieve by calling <command>dpkg --print-foreign-architectures</command>." +msgstr "" + #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:157 +#: apt.conf.5.xml:165 msgid "Default-Release" msgstr "Default-Release" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:158 +#: apt.conf.5.xml:166 msgid "" "Default release to install packages from if more than one version available. " "Contains release name, codename or release version. Examples: 'stable', " @@ -5670,25 +5723,25 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:163 +#: apt.conf.5.xml:171 msgid "Ignore-Hold" msgstr "Ignore-Hold" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:164 +#: apt.conf.5.xml:172 msgid "" "Ignore Held packages; This global option causes the problem resolver to " "ignore held packages in its decision making." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:168 +#: apt.conf.5.xml:176 #, fuzzy msgid "Clean-Installed" msgstr "B<--installed>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:169 +#: apt.conf.5.xml:177 msgid "" "Defaults to on. When turned on the autoclean feature will remove any " "packages which can no longer be downloaded from the cache. If turned off " @@ -5697,12 +5750,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:175 +#: apt.conf.5.xml:183 msgid "Immediate-Configure" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:176 +#: apt.conf.5.xml:184 msgid "" "Defaults to on which will cause APT to install essential and important " "packages as fast as possible in the install/upgrade operation. This is done " @@ -5735,12 +5788,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:198 +#: apt.conf.5.xml:206 msgid "Force-LoopBreak" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:199 +#: apt.conf.5.xml:207 msgid "" "Never Enable this option unless you -really- know what you are doing. It " "permits APT to temporarily remove an essential package to break a Conflicts/" @@ -5751,12 +5804,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:207 +#: apt.conf.5.xml:215 msgid "Cache-Start, Cache-Grow and Cache-Limit" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:208 +#: apt.conf.5.xml:216 msgid "" "APT uses since version 0.7.26 a resizable memory mapped cache file to store " "the 'available' information. <literal>Cache-Start</literal> acts as a hint " @@ -5776,63 +5829,63 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:223 +#: apt.conf.5.xml:231 msgid "Build-Essential" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:224 +#: apt.conf.5.xml:232 msgid "Defines which package(s) are considered essential build dependencies." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:227 +#: apt.conf.5.xml:235 msgid "Get" msgstr "Get" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:228 +#: apt.conf.5.xml:236 msgid "" "The Get subsection controls the &apt-get; tool, please see its documentation " "for more information about the options here." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:232 +#: apt.conf.5.xml:240 msgid "Cache" msgstr "Cache" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:233 +#: apt.conf.5.xml:241 msgid "" "The Cache subsection controls the &apt-cache; tool, please see its " "documentation for more information about the options here." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:237 +#: apt.conf.5.xml:245 msgid "CDROM" msgstr "CDROM" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:238 +#: apt.conf.5.xml:246 msgid "" "The CDROM subsection controls the &apt-cdrom; tool, please see its " "documentation for more information about the options here." msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:244 +#: apt.conf.5.xml:252 msgid "The Acquire Group" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:249 +#: apt.conf.5.xml:257 msgid "Check-Valid-Until" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:250 +#: apt.conf.5.xml:258 msgid "" "Security related option defaulting to true as an expiring validation for a " "Release file prevents longtime replay attacks and can e.g. also help users " @@ -5844,38 +5897,51 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:260 +#: apt.conf.5.xml:268 msgid "Max-ValidTime" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:261 +#: apt.conf.5.xml:269 msgid "" -"Seconds the Release file should be considered valid after it was created. " -"The default is \"for ever\" (0) if the Release file of the archive doesn't " -"include a <literal>Valid-Until</literal> header. If it does then this date " -"is the default. The date from the Release file or the date specified by the " -"creation time of the Release file (<literal>Date</literal> header) plus the " -"seconds specified with this options are used to check if the validation of a " -"file has expired by using the earlier date of the two. Archive specific " -"settings can be made by appending the label of the archive to the option " -"name." +"Seconds the Release file should be considered valid after it was created " +"(indicated by the <literal>Date</literal> header). If the Release file " +"itself includes a <literal>Valid-Until</literal> header the earlier date of " +"the two is used as the expiration date. The default value is <literal>0</" +"literal> which stands for \"for ever\". Archive specific settings can be " +"made by appending the label of the archive to the option name." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:273 +#: apt.conf.5.xml:279 +msgid "Min-ValidTime" +msgstr "" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:280 +msgid "" +"Minimum of seconds the Release file should be considered valid after it was " +"created (indicated by the <literal>Date</literal> header). Use this if you " +"need to use a seldomly updated (local) mirror of a more regular updated " +"archive with a <literal>Valid-Until</literal> header instead of completely " +"disabling the expiration date checking. Archive specific settings can and " +"should be used by appending the label of the archive to the option name." +msgstr "" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: apt.conf.5.xml:290 msgid "PDiffs" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:274 +#: apt.conf.5.xml:291 msgid "" "Try to download deltas called <literal>PDiffs</literal> for Packages or " "Sources files instead of downloading whole ones. True by default." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:277 +#: apt.conf.5.xml:294 msgid "" "Two sub-options to limit the use of PDiffs are also available: With " "<literal>FileLimit</literal> can be specified how many PDiff files are " @@ -5886,12 +5952,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:286 +#: apt.conf.5.xml:303 msgid "Queue-Mode" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:287 +#: apt.conf.5.xml:304 msgid "" "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</" "literal> or <literal>access</literal> which determines how APT parallelizes " @@ -5901,37 +5967,37 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:294 +#: apt.conf.5.xml:311 msgid "Retries" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:295 +#: apt.conf.5.xml:312 msgid "" "Number of retries to perform. If this is non-zero APT will retry failed " "files the given number of times." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:299 +#: apt.conf.5.xml:316 #, fuzzy msgid "Source-Symlinks" msgstr "Sources" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:300 +#: apt.conf.5.xml:317 msgid "" "Use symlinks for source archives. If set to true then source archives will " "be symlinked when possible instead of copying. True is the default." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:304 sources.list.5.xml:144 +#: apt.conf.5.xml:321 sources.list.5.xml:155 msgid "http" msgstr "http" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:305 +#: apt.conf.5.xml:322 msgid "" "HTTP URIs; http::Proxy is the default http proxy to use. It is in the " "standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per " @@ -5942,7 +6008,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:313 +#: apt.conf.5.xml:330 msgid "" "Three settings are provided for cache control with HTTP/1.1 compliant proxy " "caches. <literal>No-Cache</literal> tells the proxy to not use its cached " @@ -5956,7 +6022,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:323 apt.conf.5.xml:387 +#: apt.conf.5.xml:340 apt.conf.5.xml:404 msgid "" "The option <literal>timeout</literal> sets the timeout timer used by the " "method, this applies to all things including connection timeout and data " @@ -5964,7 +6030,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:326 +#: apt.conf.5.xml:343 msgid "" "One setting is provided to control the pipeline depth in cases where the " "remote server is not RFC conforming or buggy (such as Squid 2.0.2). " @@ -5976,7 +6042,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:334 +#: apt.conf.5.xml:351 msgid "" "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</" "literal> which accepts integer values in kilobyte. The default value is 0 " @@ -5986,7 +6052,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:339 +#: apt.conf.5.xml:356 msgid "" "<literal>Acquire::http::User-Agent</literal> can be used to set a different " "User-Agent for the http download method as some proxies allow access for " @@ -5994,12 +6060,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:345 +#: apt.conf.5.xml:362 msgid "https" msgstr "https" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:346 +#: apt.conf.5.xml:363 msgid "" "HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy " "options are the same as for <literal>http</literal> method and will also " @@ -6009,7 +6075,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:352 +#: apt.conf.5.xml:369 msgid "" "<literal>CaInfo</literal> suboption specifies place of file that holds info " "about trusted certificates. <literal><host>::CaInfo</literal> is " @@ -6030,12 +6096,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:370 sources.list.5.xml:155 +#: apt.conf.5.xml:387 sources.list.5.xml:166 msgid "ftp" msgstr "ftp" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:371 +#: apt.conf.5.xml:388 msgid "" "FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard " "form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host " @@ -6054,7 +6120,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:390 +#: apt.conf.5.xml:407 msgid "" "Several settings are provided to control passive mode. Generally it is safe " "to leave passive mode on, it works in nearly every environment. However " @@ -6064,7 +6130,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:397 +#: apt.conf.5.xml:414 msgid "" "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</" "envar> environment variable to a http url - see the discussion of the http " @@ -6073,7 +6139,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:402 +#: apt.conf.5.xml:419 msgid "" "The setting <literal>ForceExtended</literal> controls the use of RFC2428 " "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is " @@ -6083,18 +6149,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:409 sources.list.5.xml:137 +#: apt.conf.5.xml:426 sources.list.5.xml:148 msgid "cdrom" msgstr "cdrom" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:415 +#: apt.conf.5.xml:432 #, no-wrap msgid "/cdrom/::Mount \"foo\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:410 +#: apt.conf.5.xml:427 msgid "" "CDROM URIs; the only setting for CDROM URIs is the mount point, " "<literal>cdrom::Mount</literal> which must be the mount point for the CDROM " @@ -6107,12 +6173,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:420 +#: apt.conf.5.xml:437 msgid "gpgv" msgstr "gpgv" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:421 +#: apt.conf.5.xml:438 msgid "" "GPGV URIs; the only option for GPGV URIs is the option to pass additional " "parameters to gpgv. <literal>gpgv::Options</literal> Additional options " @@ -6120,18 +6186,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:426 +#: apt.conf.5.xml:443 msgid "CompressionTypes" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:432 +#: apt.conf.5.xml:449 #, no-wrap msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:427 +#: apt.conf.5.xml:444 msgid "" "List of compression types which are understood by the acquire methods. " "Files like <filename>Packages</filename> can be available in various " @@ -6143,19 +6209,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:437 +#: apt.conf.5.xml:454 #, no-wrap msgid "Acquire::CompressionTypes::Order:: \"gz\";" msgstr "Acquire::CompressionTypes::Order:: \"gz\";" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:440 +#: apt.conf.5.xml:457 #, no-wrap msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:433 +#: apt.conf.5.xml:450 msgid "" "Also the <literal>Order</literal> subgroup can be used to define in which " "order the acquire system will try to download the compressed files. The " @@ -6172,13 +6238,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:444 +#: apt.conf.5.xml:461 #, no-wrap msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:442 +#: apt.conf.5.xml:459 msgid "" "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</" "replaceable></literal> will be checked: If this setting exists the method " @@ -6193,7 +6259,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:449 +#: apt.conf.5.xml:466 msgid "" "The special type <literal>uncompressed</literal> can be used to give " "uncompressed files a preference, but note that most archives don't provide " @@ -6201,12 +6267,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:454 +#: apt.conf.5.xml:471 msgid "GzipIndexes" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:456 +#: apt.conf.5.xml:473 msgid "" "When downloading <literal>gzip</literal> compressed indexes (Packages, " "Sources, or Translations), keep them gzip compressed locally instead of " @@ -6215,12 +6281,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:463 +#: apt.conf.5.xml:480 msgid "Languages" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:464 +#: apt.conf.5.xml:481 msgid "" "The Languages subsection controls which <filename>Translation</filename> " "files are downloaded and in which order APT tries to display the Description-" @@ -6233,13 +6299,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting> -#: apt.conf.5.xml:480 +#: apt.conf.5.xml:497 #, no-wrap msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:470 +#: apt.conf.5.xml:487 msgid "" "The default list includes \"environment\" and \"en\". " "\"<literal>environment</literal>\" has a special meaning here: It will be " @@ -6262,19 +6328,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:245 +#: apt.conf.5.xml:253 msgid "" "The <literal>Acquire</literal> group of options controls the download of " "packages and the URI handlers. <placeholder type=\"variablelist\" id=\"0\"/>" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:487 +#: apt.conf.5.xml:504 msgid "Directories" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:489 +#: apt.conf.5.xml:506 msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " "local state information. <literal>lists</literal> is the directory to place " @@ -6286,7 +6352,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:496 +#: apt.conf.5.xml:513 msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " "information, such as the two package caches <literal>srcpkgcache</literal> " @@ -6299,7 +6365,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:505 +#: apt.conf.5.xml:522 msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " "<literal>sourcelist</literal> gives the location of the sourcelist and " @@ -6309,7 +6375,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:511 +#: apt.conf.5.xml:528 msgid "" "The <literal>Dir::Parts</literal> setting reads in all the config fragments " "in lexical order from the directory specified. After this is done then the " @@ -6317,7 +6383,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:515 +#: apt.conf.5.xml:532 msgid "" "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::" "Bin::Methods</literal> specifies the location of the method handlers and " @@ -6328,7 +6394,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:523 +#: apt.conf.5.xml:540 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@ -6341,7 +6407,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:536 +#: apt.conf.5.xml:553 msgid "" "The <literal>Ignore-Files-Silently</literal> list can be used to specify " "which files APT should silently ignore while parsing the files in the " @@ -6352,12 +6418,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:545 +#: apt.conf.5.xml:562 msgid "APT in DSelect" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:547 +#: apt.conf.5.xml:564 msgid "" "When APT is used as a &dselect; method several configuration directives " "control the default behaviour. These are in the <literal>DSelect</literal> " @@ -6365,13 +6431,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:551 +#: apt.conf.5.xml:568 #, fuzzy msgid "Clean" msgstr "B<clean>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:552 +#: apt.conf.5.xml:569 msgid "" "Cache Clean mode; this value may be one of always, prompt, auto, pre-auto " "and never. always and prompt will remove all packages from the cache after " @@ -6382,51 +6448,51 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:561 +#: apt.conf.5.xml:578 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the install phase." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:565 +#: apt.conf.5.xml:582 #, fuzzy msgid "Updateoptions" msgstr "opcje" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:566 +#: apt.conf.5.xml:583 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the update phase." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:570 +#: apt.conf.5.xml:587 msgid "PromptAfterUpdate" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:571 +#: apt.conf.5.xml:588 msgid "" "If true the [U]pdate operation in &dselect; will always prompt to continue. " "The default is to prompt only on error." msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:577 +#: apt.conf.5.xml:594 msgid "How APT calls dpkg" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:578 +#: apt.conf.5.xml:595 msgid "" "Several configuration directives control how APT invokes &dpkg;. These are " "in the <literal>DPkg</literal> section." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:583 +#: apt.conf.5.xml:600 msgid "" "This is a list of options to pass to dpkg. The options must be specified " "using the list notation and each list item is passed as a single argument to " @@ -6434,17 +6500,17 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:588 +#: apt.conf.5.xml:605 msgid "Pre-Invoke" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:588 +#: apt.conf.5.xml:605 msgid "Post-Invoke" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:589 +#: apt.conf.5.xml:606 msgid "" "This is a list of shell commands to run before/after invoking &dpkg;. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -6453,12 +6519,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:595 +#: apt.conf.5.xml:612 msgid "Pre-Install-Pkgs" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:596 +#: apt.conf.5.xml:613 msgid "" "This is a list of shell commands to run before invoking dpkg. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -6468,7 +6534,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:602 +#: apt.conf.5.xml:619 msgid "" "Version 2 of this protocol dumps more information, including the protocol " "version, the APT configuration space and the packages, files and versions " @@ -6478,37 +6544,37 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:609 +#: apt.conf.5.xml:626 msgid "Run-Directory" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:610 +#: apt.conf.5.xml:627 msgid "" "APT chdirs to this directory before invoking dpkg, the default is <filename>/" "</filename>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:614 +#: apt.conf.5.xml:631 #, fuzzy msgid "Build-options" msgstr "opcje" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:615 +#: apt.conf.5.xml:632 msgid "" "These options are passed to &dpkg-buildpackage; when compiling packages, the " "default is to disable signing and produce all binaries." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt.conf.5.xml:620 +#: apt.conf.5.xml:637 msgid "dpkg trigger usage (and related options)" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:621 +#: apt.conf.5.xml:638 msgid "" "APT can call dpkg in a way so it can make aggressive use of triggers over " "multiple calls of dpkg. Without further options dpkg will use triggers only " @@ -6523,7 +6589,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> -#: apt.conf.5.xml:636 +#: apt.conf.5.xml:653 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@ -6537,7 +6603,7 @@ msgstr "" "DPkg::TriggersPending \"true\";" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:630 +#: apt.conf.5.xml:647 msgid "" "Note that it is not guaranteed that APT will support these options or that " "these options will not cause (big) trouble in the future. If you have " @@ -6551,12 +6617,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:642 +#: apt.conf.5.xml:659 msgid "DPkg::NoTriggers" msgstr "DPkg::NoTriggers" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:643 +#: apt.conf.5.xml:660 msgid "" "Add the no triggers flag to all dpkg calls (except the ConfigurePending " "call). See &dpkg; if you are interested in what this actually means. In " @@ -6568,12 +6634,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:650 +#: apt.conf.5.xml:667 msgid "PackageManager::Configure" msgstr "PackageManager::Configure" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:651 +#: apt.conf.5.xml:668 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default " @@ -6589,12 +6655,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:661 +#: apt.conf.5.xml:678 msgid "DPkg::ConfigurePending" msgstr "DPkg::ConfigurePending" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:662 +#: apt.conf.5.xml:679 msgid "" "If this option is set apt will call <command>dpkg --configure --pending</" "command> to let dpkg handle all required configurations and triggers. This " @@ -6605,12 +6671,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:668 +#: apt.conf.5.xml:685 msgid "DPkg::TriggersPending" msgstr "DPkg::TriggersPending" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:669 +#: apt.conf.5.xml:686 msgid "" "Useful for <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal> and dpkg " @@ -6620,12 +6686,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:674 +#: apt.conf.5.xml:691 msgid "PackageManager::UnpackAll" msgstr "PackageManager::UnpackAll" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:675 +#: apt.conf.5.xml:692 msgid "" "As the configuration can be deferred to be done at the end by dpkg it can be " "tried to order the unpack series only by critical needs, e.g. by Pre-" @@ -6637,12 +6703,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:682 +#: apt.conf.5.xml:699 msgid "OrderList::Score::Immediate" msgstr "OrderList::Score::Immediate" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:690 +#: apt.conf.5.xml:707 #, no-wrap msgid "" "OrderList::Score {\n" @@ -6660,7 +6726,7 @@ msgstr "" "};" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:683 +#: apt.conf.5.xml:700 msgid "" "Essential packages (and there dependencies) should be configured immediately " "after unpacking. It will be a good idea to do this quite early in the " @@ -6674,12 +6740,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:703 +#: apt.conf.5.xml:720 msgid "Periodic and Archives options" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:704 +#: apt.conf.5.xml:721 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by " @@ -6688,13 +6754,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:712 +#: apt.conf.5.xml:729 #, fuzzy msgid "Debug options" msgstr "opcje" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:714 +#: apt.conf.5.xml:731 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@ -6705,7 +6771,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:725 +#: apt.conf.5.xml:742 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</" @@ -6713,7 +6779,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:733 +#: apt.conf.5.xml:750 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s install</" @@ -6721,7 +6787,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:742 +#: apt.conf.5.xml:759 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@ -6731,7 +6797,7 @@ msgstr "" #. motivating example, except I haven't a clue why you'd want #. to do this. #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:750 +#: apt.conf.5.xml:767 #, fuzzy msgid "" "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " @@ -6741,104 +6807,104 @@ msgstr "" "in CDROM IDs." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:760 +#: apt.conf.5.xml:777 msgid "A full list of debugging options to apt follows." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:765 +#: apt.conf.5.xml:782 msgid "<literal>Debug::Acquire::cdrom</literal>" msgstr "<literal>Debug::Acquire::cdrom</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:769 +#: apt.conf.5.xml:786 msgid "" "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:776 +#: apt.conf.5.xml:793 msgid "<literal>Debug::Acquire::ftp</literal>" msgstr "<literal>Debug::Acquire::ftp</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:780 +#: apt.conf.5.xml:797 msgid "Print information related to downloading packages using FTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:787 +#: apt.conf.5.xml:804 msgid "<literal>Debug::Acquire::http</literal>" msgstr "<literal>Debug::Acquire::http</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:791 +#: apt.conf.5.xml:808 msgid "Print information related to downloading packages using HTTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:798 +#: apt.conf.5.xml:815 msgid "<literal>Debug::Acquire::https</literal>" msgstr "<literal>Debug::Acquire::https</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:802 +#: apt.conf.5.xml:819 msgid "Print information related to downloading packages using HTTPS." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:809 +#: apt.conf.5.xml:826 msgid "<literal>Debug::Acquire::gpgv</literal>" msgstr "<literal>Debug::Acquire::gpgv</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:813 +#: apt.conf.5.xml:830 msgid "" "Print information related to verifying cryptographic signatures using " "<literal>gpg</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:820 +#: apt.conf.5.xml:837 msgid "<literal>Debug::aptcdrom</literal>" msgstr "<literal>Debug::aptcdrom</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:824 +#: apt.conf.5.xml:841 msgid "" "Output information about the process of accessing collections of packages " "stored on CD-ROMs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:831 +#: apt.conf.5.xml:848 msgid "<literal>Debug::BuildDeps</literal>" msgstr "<literal>Debug::BuildDeps</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:834 +#: apt.conf.5.xml:851 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:841 +#: apt.conf.5.xml:858 msgid "<literal>Debug::Hashes</literal>" msgstr "<literal>Debug::Hashes</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:844 +#: apt.conf.5.xml:861 msgid "" "Output each cryptographic hash that is generated by the <literal>apt</" "literal> libraries." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:851 +#: apt.conf.5.xml:868 msgid "<literal>Debug::IdentCDROM</literal>" msgstr "<literal>Debug::IdentCDROM</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:854 +#: apt.conf.5.xml:871 msgid "" "Do not include information from <literal>statfs</literal>, namely the number " "of used and free blocks on the CD-ROM filesystem, when generating an ID for " @@ -6846,93 +6912,93 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:862 +#: apt.conf.5.xml:879 msgid "<literal>Debug::NoLocking</literal>" msgstr "<literal>Debug::NoLocking</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:865 +#: apt.conf.5.xml:882 msgid "" "Disable all file locking. For instance, this will allow two instances of " "<quote><literal>apt-get update</literal></quote> to run at the same time." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:873 +#: apt.conf.5.xml:890 msgid "<literal>Debug::pkgAcquire</literal>" msgstr "<literal>Debug::pkgAcquire</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:877 +#: apt.conf.5.xml:894 msgid "Log when items are added to or removed from the global download queue." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:884 +#: apt.conf.5.xml:901 msgid "<literal>Debug::pkgAcquire::Auth</literal>" msgstr "<literal>Debug::pkgAcquire::Auth</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:887 +#: apt.conf.5.xml:904 msgid "" "Output status messages and errors related to verifying checksums and " "cryptographic signatures of downloaded files." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:894 +#: apt.conf.5.xml:911 msgid "<literal>Debug::pkgAcquire::Diffs</literal>" msgstr "<literal>Debug::pkgAcquire::Diffs</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:897 +#: apt.conf.5.xml:914 msgid "" "Output information about downloading and applying package index list diffs, " "and errors relating to package index list diffs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:905 +#: apt.conf.5.xml:922 msgid "<literal>Debug::pkgAcquire::RRed</literal>" msgstr "<literal>Debug::pkgAcquire::RRed</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:909 +#: apt.conf.5.xml:926 msgid "" "Output information related to patching apt package lists when downloading " "index diffs instead of full indices." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:916 +#: apt.conf.5.xml:933 msgid "<literal>Debug::pkgAcquire::Worker</literal>" msgstr "<literal>Debug::pkgAcquire::Worker</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:920 +#: apt.conf.5.xml:937 msgid "" "Log all interactions with the sub-processes that actually perform downloads." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:927 +#: apt.conf.5.xml:944 msgid "<literal>Debug::pkgAutoRemove</literal>" msgstr "<literal>Debug::pkgAutoRemove</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:931 +#: apt.conf.5.xml:948 msgid "" "Log events related to the automatically-installed status of packages and to " "the removal of unused packages." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:938 +#: apt.conf.5.xml:955 msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>" msgstr "<literal>Debug::pkgDepCache::AutoInstall</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:941 +#: apt.conf.5.xml:958 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial auto-" @@ -6942,12 +7008,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:952 +#: apt.conf.5.xml:969 msgid "<literal>Debug::pkgDepCache::Marker</literal>" msgstr "<literal>Debug::pkgDepCache::Marker</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:955 +#: apt.conf.5.xml:972 msgid "" "Generate debug messages describing which package is marked as keep/install/" "remove while the ProblemResolver does his work. Each addition or deletion " @@ -6964,91 +7030,91 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:974 +#: apt.conf.5.xml:991 msgid "<literal>Debug::pkgInitConfig</literal>" msgstr "<literal>Debug::pkgInitConfig</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:977 +#: apt.conf.5.xml:994 msgid "Dump the default configuration to standard error on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:984 +#: apt.conf.5.xml:1001 msgid "<literal>Debug::pkgDPkgPM</literal>" msgstr "<literal>Debug::pkgDPkgPM</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:987 +#: apt.conf.5.xml:1004 msgid "" "When invoking &dpkg;, output the precise command line with which it is being " "invoked, with arguments separated by a single space character." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:995 +#: apt.conf.5.xml:1012 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" msgstr "<literal>Debug::pkgDPkgProgressReporting</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:998 +#: apt.conf.5.xml:1015 msgid "" "Output all the data received from &dpkg; on the status file descriptor and " "any errors encountered while parsing it." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1005 +#: apt.conf.5.xml:1022 msgid "<literal>Debug::pkgOrderList</literal>" msgstr "<literal>Debug::pkgOrderList</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1009 +#: apt.conf.5.xml:1026 msgid "" "Generate a trace of the algorithm that decides the order in which " "<literal>apt</literal> should pass packages to &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1017 +#: apt.conf.5.xml:1034 msgid "<literal>Debug::pkgPackageManager</literal>" msgstr "<literal>Debug::pkgPackageManager</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1021 +#: apt.conf.5.xml:1038 msgid "" "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1028 +#: apt.conf.5.xml:1045 msgid "<literal>Debug::pkgPolicy</literal>" msgstr "<literal>Debug::pkgPolicy</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1032 +#: apt.conf.5.xml:1049 msgid "Output the priority of each package list on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1038 +#: apt.conf.5.xml:1055 msgid "<literal>Debug::pkgProblemResolver</literal>" msgstr "<literal>Debug::pkgProblemResolver</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1042 +#: apt.conf.5.xml:1059 msgid "" "Trace the execution of the dependency resolver (this applies only to what " "happens when a complex dependency problem is encountered)." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1050 +#: apt.conf.5.xml:1067 msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>" msgstr "<literal>Debug::pkgProblemResolver::ShowScores</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1053 +#: apt.conf.5.xml:1070 msgid "" "Display a list of all installed packages with their calculated score used by " "the pkgProblemResolver. The description of the package is the same as " @@ -7056,32 +7122,32 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1061 +#: apt.conf.5.xml:1078 msgid "<literal>Debug::sourceList</literal>" msgstr "<literal>Debug::sourceList</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1065 +#: apt.conf.5.xml:1082 msgid "" "Print information about the vendors read from <filename>/etc/apt/vendors." "list</filename>." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1088 +#: apt.conf.5.xml:1105 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." msgstr "" #. type: Content of: <refentry><refsect1><variablelist> -#: apt.conf.5.xml:1095 +#: apt.conf.5.xml:1112 msgid "&file-aptconf;" msgstr "&file-aptconf;" #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1100 +#: apt.conf.5.xml:1117 msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "&apt-cache;, &apt-config;, &apt-preferences;." @@ -8337,8 +8403,9 @@ msgstr "" #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml:81 -#, no-wrap -msgid "deb uri distribution [component1] [component2] [...]" +#, fuzzy, no-wrap +#| msgid "deb uri distribution [component1] [component2] [...]" +msgid "deb [ options ] uri distribution [component1] [component2] [...]" msgstr "deb URI dystrybucja [komponent1] [komponent2] [...]" #. type: Content of: <refentry><refsect1><para> @@ -8411,6 +8478,27 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:112 msgid "" +"<literal>options</literal> is always optional and needs to be surounded by " +"square brackets. It can consist of multiple settings in the form " +"<literal><replaceable>setting</replaceable>=<replaceable>value</" +"replaceable></literal>. Multiple settings are separated by spaces. The " +"following settings are supported by APT, note though that unsupported " +"settings will be ignored silently:" +msgstr "" + +#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> +#: sources.list.5.xml:117 +msgid "" +"<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</" +"replaceable>,…</literal> can be used to specify for which architectures " +"packages information should be downloaded. If this option is not set all " +"architectures defined by the <literal>APT::Architectures</literal> option " +"will be downloaded." +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:123 +msgid "" "It is important to list sources in order of preference, with the most " "preferred source listed first. Typically this will result in sorting by " "speed from fastest to slowest (CD-ROM followed by hosts on a local network, " @@ -8423,12 +8511,12 @@ msgstr "" "komputerami w Internecie)." #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:117 +#: sources.list.5.xml:128 msgid "Some examples:" msgstr "Kilka przykładów:" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:119 +#: sources.list.5.xml:130 #, fuzzy, no-wrap #| msgid "" #| "deb http://http.us.debian.org/debian stable main contrib non-free\n" @@ -8444,17 +8532,17 @@ msgstr "" " " #. type: Content of: <refentry><refsect1><title> -#: sources.list.5.xml:125 +#: sources.list.5.xml:136 msgid "URI specification" msgstr "Określanie URI" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: sources.list.5.xml:130 +#: sources.list.5.xml:141 msgid "file" msgstr "file" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:132 +#: sources.list.5.xml:143 msgid "" "The file scheme allows an arbitrary directory in the file system to be " "considered an archive. This is useful for NFS mounts and local mirrors or " @@ -8465,7 +8553,7 @@ msgstr "" "archiwów." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:139 +#: sources.list.5.xml:150 msgid "" "The cdrom scheme allows APT to use a local CDROM drive with media swapping. " "Use the &apt-cdrom; program to create cdrom entries in the source list." @@ -8475,7 +8563,7 @@ msgstr "" "list." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:146 +#: sources.list.5.xml:157 msgid "" "The http scheme specifies an HTTP server for the archive. If an environment " "variable <envar>http_proxy</envar> is set with the format http://server:" @@ -8492,7 +8580,7 @@ msgstr "" "bezpieczny." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:157 +#: sources.list.5.xml:168 msgid "" "The ftp scheme specifies an FTP server for the archive. APT's FTP behavior " "is highly configurable; for more information see the &apt-conf; manual page. " @@ -8511,12 +8599,12 @@ msgstr "" "używające http zostaną zignorowane." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: sources.list.5.xml:166 +#: sources.list.5.xml:177 msgid "copy" msgstr "copy" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:168 +#: sources.list.5.xml:179 msgid "" "The copy scheme is identical to the file scheme except that packages are " "copied into the cache directory instead of used directly at their location. " @@ -8528,17 +8616,17 @@ msgstr "" "skopiowania plików przy użyciu APT." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: sources.list.5.xml:173 +#: sources.list.5.xml:184 msgid "rsh" msgstr "rsh" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: sources.list.5.xml:173 +#: sources.list.5.xml:184 msgid "ssh" msgstr "ssh" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:175 +#: sources.list.5.xml:186 msgid "" "The rsh/ssh method invokes rsh/ssh to connect to a remote host as a given " "user and access the files. It is a good idea to do prior arrangements with " @@ -8554,12 +8642,12 @@ msgstr "" "ze zdalnego komputera." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: sources.list.5.xml:183 +#: sources.list.5.xml:194 msgid "more recognizable URI types" msgstr "więcej rozpoznawanych typów URI" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:185 +#: sources.list.5.xml:196 msgid "" "APT can be extended with more methods shipped in other optional packages " "which should follow the nameing scheme <literal>apt-transport-" @@ -8581,7 +8669,7 @@ msgstr "" "citerefentry>." #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:127 +#: sources.list.5.xml:138 msgid "" "The currently recognized URI types are cdrom, file, http, ftp, copy, ssh, " "rsh. <placeholder type=\"variablelist\" id=\"0\"/>" @@ -8590,7 +8678,7 @@ msgstr "" "ssh, rsh. <placeholder type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:199 +#: sources.list.5.xml:210 msgid "" "Uses the archive stored locally (or NFS mounted) at /home/jason/debian for " "stable/main, stable/contrib, and stable/non-free." @@ -8599,36 +8687,59 @@ msgstr "" "debian dla zasobów stable/main, stable/contrib i stable/non-free." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:201 +#: sources.list.5.xml:212 #, no-wrap msgid "deb file:/home/jason/debian stable main contrib non-free" msgstr "deb file:/home/jason/debian stable main contrib non-free" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:203 +#: sources.list.5.xml:214 msgid "As above, except this uses the unstable (development) distribution." msgstr "" "Jak wyżej, z tą różnicą że używa dystrybucji niestabilnej (deweloperskiej)." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:204 +#: sources.list.5.xml:215 #, no-wrap msgid "deb file:/home/jason/debian unstable main contrib non-free" msgstr "deb file:/home/jason/debian unstable main contrib non-free" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:206 +#: sources.list.5.xml:217 msgid "Source line for the above" msgstr "Linie źródeł dla powyższego przykładu" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:207 +#: sources.list.5.xml:218 #, no-wrap msgid "deb-src file:/home/jason/debian unstable main contrib non-free" msgstr "deb-src file:/home/jason/debian unstable main contrib non-free" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:209 +#: sources.list.5.xml:220 +msgid "" +"The first line gets package information for the architectures in " +"<literal>APT::Architectures</literal> while the second always retrieves " +"<literal>amd64</literal> and <literal>armel</literal>." +msgstr "" + +#. type: Content of: <refentry><refsect1><literallayout> +#: sources.list.5.xml:222 +#, fuzzy, no-wrap +#| msgid "" +#| "deb http://http.us.debian.org/debian stable main contrib non-free\n" +#| "deb http://http.us.debian.org/debian dists/stable-updates/\n" +#| " " +msgid "" +"deb http://ftp.debian.org/debian &stable-codename; main\n" +"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main" +msgstr "" +"deb http://http.us.debian.org/debian stable main contrib non-free\n" +"deb http://http.us.debian.org/debian dists/stable-updates/\n" +" " + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:225 msgid "" "Uses HTTP to access the archive at archive.debian.org, and uses only the " "hamm/main area." @@ -8637,13 +8748,13 @@ msgstr "" "org i dystrybucji hamm/main." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:211 +#: sources.list.5.xml:227 #, no-wrap msgid "deb http://archive.debian.org/debian-archive hamm main" msgstr "deb http://archive.debian.org/debian-archive hamm main" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:213 +#: sources.list.5.xml:229 #, fuzzy #| msgid "" #| "Uses FTP to access the archive at ftp.debian.org, under the debian " @@ -8656,14 +8767,14 @@ msgstr "" "dystrybucji stable/contrib." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:215 +#: sources.list.5.xml:231 #, fuzzy, no-wrap #| msgid "deb ftp://ftp.debian.org/debian stable contrib" msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib" msgstr "deb ftp://ftp.debian.org/debian stable contrib" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:217 +#: sources.list.5.xml:233 msgid "" "Uses FTP to access the archive at ftp.debian.org, under the debian " "directory, and uses only the unstable/contrib area. If this line appears as " @@ -8676,20 +8787,20 @@ msgstr "" "to pojedyncza sesja FTP będzie użyta w celu uzyskania dostępu do obu zasobów." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:221 +#: sources.list.5.xml:237 #, no-wrap msgid "deb ftp://ftp.debian.org/debian unstable contrib" msgstr "deb ftp://ftp.debian.org/debian unstable contrib" #. type: Content of: <refentry><refsect1><para><literallayout> -#: sources.list.5.xml:230 +#: sources.list.5.xml:246 #, fuzzy, no-wrap #| msgid "deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/" msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/" msgstr "deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:223 +#: sources.list.5.xml:239 #, fuzzy #| msgid "" #| "Uses HTTP to access the archive at nonus.debian.org, under the debian-non-" @@ -8717,7 +8828,7 @@ msgstr "" "<placeholder type=\"literallayout\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:235 +#: sources.list.5.xml:251 msgid "&apt-cache; &apt-conf;" msgstr "&apt-cache;, &apt-conf;" @@ -10246,6 +10357,14 @@ msgstr " # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade" msgid "Which will use the already fetched archives on the disc." msgstr "Które użyje pobranych uprzednio archiwów z dysku." +#~ msgid "" +#~ "Update the local keyring with the keyring of Debian archive keys and " +#~ "removes from the keyring the archive keys which are no longer valid." +#~ msgstr "" +#~ "Aktualizuje lokalną składnicę kluczy używając składnicy kluczy archiwum " +#~ "Debiana i usuwa z lokalnej składnicy nieaktualne już klucze archiwów " +#~ "Debiana." + #~ msgid "<option>--md5</option>" #~ msgstr "<option>--md5</option>" diff --git a/doc/po/pt.po b/doc/po/pt.po index 775e9f77e..a96a2c97a 100644 --- a/doc/po/pt.po +++ b/doc/po/pt.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.8.0~pre1\n" -"POT-Creation-Date: 2011-06-28 16:42+0200\n" +"POT-Creation-Date: 2011-11-20 17:58+0100\n" "PO-Revision-Date: 2010-08-25 23:07+0100\n" "Last-Translator: Américo Monteiro <a_monteiro@netcabo.pt>\n" "Language-Team: Portuguese <traduz@debianpt.org>\n" @@ -762,7 +762,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:64 apt-cdrom.8.xml:50 apt-config.8.xml:50 -#: apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:114 +#: apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:121 #: apt-key.8.xml:38 apt-mark.8.xml:56 apt-secure.8.xml:43 #: apt-sortpkgs.1.xml:47 apt.conf.5.xml:42 apt_preferences.5.xml:36 #: sources.list.5.xml:36 @@ -783,7 +783,7 @@ msgstr "" "a partir dos metadados do pacote." #. type: Content of: <refentry><refsect1><para> -#: apt-cache.8.xml:70 apt-get.8.xml:120 +#: apt-cache.8.xml:70 apt-get.8.xml:127 msgid "" "Unless the <option>-h</option>, or <option>--help</option> option is given, " "one of the commands below must be present." @@ -1279,8 +1279,8 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:278 apt-config.8.xml:96 apt-extracttemplates.1.xml:59 -#: apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:126 -#: apt-sortpkgs.1.xml:57 apt.conf.5.xml:560 apt.conf.5.xml:582 +#: apt-ftparchive.1.xml:525 apt-get.8.xml:342 apt-mark.8.xml:126 +#: apt-sortpkgs.1.xml:57 apt.conf.5.xml:577 apt.conf.5.xml:599 msgid "options" msgstr "opções" @@ -1306,7 +1306,7 @@ msgstr "" "<literal>Dir::Cache::pkgcache</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:288 apt-ftparchive.1.xml:572 apt-get.8.xml:393 +#: apt-cache.8.xml:288 apt-ftparchive.1.xml:572 apt-get.8.xml:404 #: apt-sortpkgs.1.xml:61 msgid "<option>-s</option>" msgstr "<option>-s</option>" @@ -1332,12 +1332,12 @@ msgstr "" "pacote. Item de Configuração: <literal>Dir::Cache::srcpkgcache</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:383 +#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:394 msgid "<option>-q</option>" msgstr "<option>-q</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:383 +#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:394 msgid "<option>--quiet</option>" msgstr "<option>--quiet</option>" @@ -1439,7 +1439,7 @@ msgstr "" "ex. <literal>APT::Cache::ShowRecommends</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:323 apt-cdrom.8.xml:124 apt-get.8.xml:350 +#: apt-cache.8.xml:323 apt-cdrom.8.xml:124 apt-get.8.xml:361 msgid "<option>-f</option>" msgstr "<option>-f</option>" @@ -1459,6 +1459,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:584 +#: apt-get.8.xml:447 msgid "<option>-a</option>" msgstr "<option>-a</option>" @@ -1575,14 +1576,14 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist> #: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101 -#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:612 apt-get.8.xml:570 +#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:612 apt-get.8.xml:591 #: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67 msgid "&apt-commonoptions;" msgstr "&apt-commonoptions;" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:172 apt-mark.8.xml:144 -#: apt.conf.5.xml:1093 apt_preferences.5.xml:697 +#: apt-cache.8.xml:372 apt-get.8.xml:596 apt-key.8.xml:175 apt-mark.8.xml:144 +#: apt.conf.5.xml:1110 apt_preferences.5.xml:697 msgid "Files" msgstr "Ficheiros" @@ -1593,10 +1594,10 @@ msgstr "&file-sourceslist; &file-statelists;" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106 -#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:628 apt-get.8.xml:585 -#: apt-key.8.xml:193 apt-mark.8.xml:150 apt-secure.8.xml:185 -#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:704 -#: sources.list.5.xml:234 +#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:628 apt-get.8.xml:606 +#: apt-key.8.xml:196 apt-mark.8.xml:150 apt-secure.8.xml:185 +#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1116 apt_preferences.5.xml:704 +#: sources.list.5.xml:250 msgid "See Also" msgstr "Veja também" @@ -1607,7 +1608,7 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111 -#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:632 apt-get.8.xml:591 +#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:632 apt-get.8.xml:612 #: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76 msgid "Diagnostics" msgstr "Diagnóstico" @@ -1737,12 +1738,12 @@ msgstr "" "\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><title> -#: apt-cdrom.8.xml:94 apt-key.8.xml:158 +#: apt-cdrom.8.xml:94 apt-key.8.xml:161 msgid "Options" msgstr "Opções" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:540 apt-get.8.xml:345 +#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:540 apt-get.8.xml:356 msgid "<option>-d</option>" msgstr "<option>-d</option>" @@ -1786,7 +1787,7 @@ msgstr "" "CDROM::Rename</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cdrom.8.xml:116 apt-get.8.xml:364 +#: apt-cdrom.8.xml:116 apt-get.8.xml:375 msgid "<option>-m</option>" msgstr "<option>-m</option>" @@ -1841,17 +1842,17 @@ msgstr "" "estranhos. Demora muito mais tempo a sondar o CD mas irá apanhá-los a todos." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cdrom.8.xml:143 apt-get.8.xml:395 +#: apt-cdrom.8.xml:143 apt-get.8.xml:406 msgid "<option>--just-print</option>" msgstr "<option>--just-print</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cdrom.8.xml:144 apt-get.8.xml:397 +#: apt-cdrom.8.xml:144 apt-get.8.xml:408 msgid "<option>--recon</option>" msgstr "<option>--recon</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cdrom.8.xml:145 apt-get.8.xml:398 +#: apt-cdrom.8.xml:145 apt-get.8.xml:409 msgid "<option>--no-act</option>" msgstr "<option>--no-act</option>" @@ -2074,7 +2075,7 @@ msgstr "" "configuração.XXXX</filename>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-extracttemplates.1.xml:63 apt-get.8.xml:504 +#: apt-extracttemplates.1.xml:63 apt-get.8.xml:525 msgid "<option>-t</option>" msgstr "<option>-t</option>" @@ -2351,7 +2352,7 @@ msgstr "" "definições requeridas." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:145 apt-get.8.xml:287 +#: apt-ftparchive.1.xml:145 apt-get.8.xml:298 msgid "clean" msgstr "clean" @@ -2917,8 +2918,8 @@ msgstr "" "distribuição, tipicamente isto é algo como <literal>main contrib non-free</" "literal>" -#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:394 +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:394 apt.conf.5.xml:157 msgid "Architectures" msgstr "Architectures" @@ -3322,8 +3323,8 @@ msgstr "" "<filename>Translation-en</filename> só pode ser criado no comando generate." #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:617 apt.conf.5.xml:1087 apt_preferences.5.xml:544 -#: sources.list.5.xml:198 +#: apt-ftparchive.1.xml:617 apt.conf.5.xml:1104 apt_preferences.5.xml:544 +#: sources.list.5.xml:209 msgid "Examples" msgstr "Examples" @@ -3375,15 +3376,45 @@ msgstr "" #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> #: apt-get.8.xml:39 +#, fuzzy +#| msgid "" +#| "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> " +#| "<option>-o= <replaceable>config_string</replaceable> </option> </arg> " +#| "<arg> <option>-c= <replaceable>config_file</replaceable> </option> </arg> " +#| "<arg> <option>-t=</option> <arg choice='plain'> " +#| "<replaceable>target_release</replaceable> </arg> </arg> <group choice=" +#| "\"req\"> <arg choice='plain'>update</arg> <arg choice='plain'>upgrade</" +#| "arg> <arg choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-" +#| "upgrade</arg> <arg choice='plain'>install <arg choice=\"plain\" rep=" +#| "\"repeat\"><replaceable>pkg</replaceable> <arg> <group choice='req'> <arg " +#| "choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> " +#| "<arg choice='plain'> /<replaceable>target_release</replaceable> </arg> </" +#| "group> </arg> </arg> </arg> <arg choice='plain'>remove <arg choice=\"plain" +#| "\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg " +#| "choice='plain'>purge <arg choice=\"plain\" rep=\"repeat" +#| "\"><replaceable>pkg</replaceable></arg></arg> <arg choice='plain'>source " +#| "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> <arg> " +#| "<group choice='req'> <arg choice='plain'> " +#| "=<replaceable>pkg_version_number</replaceable> </arg> <arg " +#| "choice='plain'> /<replaceable>target_release</replaceable> </arg> </" +#| "group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice=" +#| "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg " +#| "choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg " +#| "choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg " +#| "choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg " +#| "choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> " +#| "<group choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--" +#| "help</arg> </group> </arg> </group>" msgid "" "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> " "<option>-o= <replaceable>config_string</replaceable> </option> </arg> <arg> " "<option>-c= <replaceable>config_file</replaceable> </option> </arg> <arg> " "<option>-t=</option> <arg choice='plain'> <replaceable>target_release</" -"replaceable> </arg> </arg> <group choice=\"req\"> <arg " -"choice='plain'>update</arg> <arg choice='plain'>upgrade</arg> <arg " -"choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-upgrade</arg> " -"<arg choice='plain'>install <arg choice=\"plain\" rep=\"repeat" +"replaceable> </arg> </arg> <arg> <option>-a=</option> <arg choice='plain'> " +"<replaceable>default_architecture</replaceable> </arg> </arg> <group choice=" +"\"req\"> <arg choice='plain'>update</arg> <arg choice='plain'>upgrade</arg> " +"<arg choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-upgrade</" +"arg> <arg choice='plain'>install <arg choice=\"plain\" rep=\"repeat" "\"><replaceable>pkg</replaceable> <arg> <group choice='req'> <arg " "choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> <arg " "choice='plain'> /<replaceable>target_release</replaceable> </arg> </group> </" @@ -3432,7 +3463,7 @@ msgstr "" "</group> </arg> </group>" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:115 +#: apt-get.8.xml:122 msgid "" "<command>apt-get</command> is the command-line tool for handling packages, " "and may be considered the user's \"back-end\" to other tools using the APT " @@ -3445,12 +3476,12 @@ msgstr "" "\"front-end\" como o &dselect;, &aptitude;, &synaptic; e &wajig;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:124 apt-key.8.xml:127 +#: apt-get.8.xml:131 apt-key.8.xml:127 msgid "update" msgstr "update" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:125 +#: apt-get.8.xml:132 msgid "" "<literal>update</literal> is used to resynchronize the package index files " "from their sources. The indexes of available packages are fetched from the " @@ -3474,12 +3505,12 @@ msgstr "" "ficheiros de pacotes não pode ser conhecido com antecedência." #. type: <tag></tag> -#: apt-get.8.xml:136 guide.sgml:121 +#: apt-get.8.xml:143 guide.sgml:121 msgid "upgrade" msgstr "upgrade" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:137 +#: apt-get.8.xml:144 msgid "" "<literal>upgrade</literal> is used to install the newest versions of all " "packages currently installed on the system from the sources enumerated in " @@ -3505,12 +3536,12 @@ msgstr "" "novas versões de pacotes." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:149 +#: apt-get.8.xml:156 msgid "dselect-upgrade" msgstr "dselect-upgrade" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:150 +#: apt-get.8.xml:157 msgid "" "<literal>dselect-upgrade</literal> is used in conjunction with the " "traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</" @@ -3526,12 +3557,12 @@ msgstr "" "estado (por exemplo, a remoção de pacotes antigos e a instalação de novos)." #. type: <tag></tag> -#: apt-get.8.xml:159 guide.sgml:140 +#: apt-get.8.xml:166 guide.sgml:140 msgid "dist-upgrade" msgstr "dist-upgrade" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:160 +#: apt-get.8.xml:167 msgid "" "<literal>dist-upgrade</literal> in addition to performing the function of " "<literal>upgrade</literal>, also intelligently handles changing dependencies " @@ -3555,12 +3586,12 @@ msgstr "" "sobrepor as definições gerais em pacotes individuais." #. type: <tag></tag> -#: apt-get.8.xml:172 guide.sgml:131 +#: apt-get.8.xml:179 guide.sgml:131 msgid "install" msgstr "install" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:174 +#: apt-get.8.xml:181 msgid "" "<literal>install</literal> is followed by one or more packages desired for " "installation or upgrading. Each package is a package name, not a fully " @@ -3588,7 +3619,7 @@ msgstr "" "decisões feitas pelo sistema de resolução de conflitos do apt-get." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:192 +#: apt-get.8.xml:199 msgid "" "A specific version of a package can be selected for installation by " "following the package name with an equals and the version of the package to " @@ -3605,7 +3636,7 @@ msgstr "" "versão da distribuição ou o nome de Arquivo (stable, testing, unstable)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:199 +#: apt-get.8.xml:206 msgid "" "Both of the version selection mechanisms can downgrade packages and must be " "used with care." @@ -3614,7 +3645,7 @@ msgstr "" "e devem ser usados com cuidado." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:202 +#: apt-get.8.xml:209 msgid "" "This is also the target to use if you want to upgrade one or more already-" "installed packages without upgrading every package you have on your system. " @@ -3634,7 +3665,7 @@ msgstr "" "descarregadas e instaladas." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:213 +#: apt-get.8.xml:220 msgid "" "Finally, the &apt-preferences; mechanism allows you to create an alternative " "installation policy for individual packages." @@ -3643,7 +3674,7 @@ msgstr "" "instalação alternativa para pacotes individuais." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:217 +#: apt-get.8.xml:224 msgid "" "If no package matches the given expression and the expression contains one " "of '.', '?' or '*' then it is assumed to be a POSIX regular expression, and " @@ -3662,12 +3693,12 @@ msgstr "" "caractere '^' ou '$', para criar uma expressão regular mais específica." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:226 +#: apt-get.8.xml:233 msgid "remove" msgstr "remove" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:227 +#: apt-get.8.xml:234 msgid "" "<literal>remove</literal> is identical to <literal>install</literal> except " "that packages are removed instead of installed. Note the removing a package " @@ -3682,12 +3713,12 @@ msgstr "" "pacote identificado será instalado em vez de removido." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:234 +#: apt-get.8.xml:241 msgid "purge" msgstr "purge" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:235 +#: apt-get.8.xml:242 msgid "" "<literal>purge</literal> is identical to <literal>remove</literal> except " "that packages are removed and purged (any configuration files are deleted " @@ -3698,12 +3729,12 @@ msgstr "" "configuração são também apagados)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:239 +#: apt-get.8.xml:246 msgid "source" msgstr "source" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:240 +#: apt-get.8.xml:247 msgid "" "<literal>source</literal> causes <command>apt-get</command> to fetch source " "packages. APT will examine the available packages to decide which source " @@ -3722,7 +3753,7 @@ msgstr "" "<literal>pkg/release</literal>, se possível." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:248 +#: apt-get.8.xml:255 msgid "" "Source packages are tracked separately from binary packages via <literal>deb-" "src</literal> type lines in the &sources-list; file. This means that you " @@ -3738,12 +3769,19 @@ msgstr "" "instalada ou pode instalar." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:255 +#: apt-get.8.xml:262 +#, fuzzy +#| msgid "" +#| "If the <option>--compile</option> option is specified then the package " +#| "will be compiled to a binary .deb using <command>dpkg-buildpackage</" +#| "command>, if <option>--download-only</option> is specified then the " +#| "source package will not be unpacked." msgid "" "If the <option>--compile</option> option is specified then the package will " -"be compiled to a binary .deb using <command>dpkg-buildpackage</command>, if " -"<option>--download-only</option> is specified then the source package will " -"not be unpacked." +"be compiled to a binary .deb using <command>dpkg-buildpackage</command> for " +"the architecture as defined by the <command>--host-architecture</command> " +"option. If <option>--download-only</option> is specified then the source " +"package will not be unpacked." msgstr "" "Se for especificada a opção <option>--compile</option> então o pacote irá " "ser compilado para um binário .deb usando <command>dpkg-buildpackage</" @@ -3751,7 +3789,7 @@ msgstr "" "pacote fonte não será desempacotado." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:260 +#: apt-get.8.xml:269 msgid "" "A specific source version can be retrieved by postfixing the source name " "with an equals and then the version to fetch, similar to the mechanism used " @@ -3766,7 +3804,7 @@ msgstr "" "Only-Source</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:266 +#: apt-get.8.xml:275 msgid "" "Note that source packages are not tracked like binary packages, they exist " "only in the current directory and are similar to downloading source tar " @@ -3777,26 +3815,33 @@ msgstr "" "balls fonte." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:271 +#: apt-get.8.xml:280 msgid "build-dep" msgstr "build-dep" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:272 +#: apt-get.8.xml:281 +#, fuzzy +#| msgid "" +#| "<literal>build-dep</literal> causes apt-get to install/remove packages in " +#| "an attempt to satisfy the build dependencies for a source package." msgid "" "<literal>build-dep</literal> causes apt-get to install/remove packages in an " -"attempt to satisfy the build dependencies for a source package." +"attempt to satisfy the build dependencies for a source package. By default " +"the dependencies are satisfied to build the package natively. If desired a " +"host-architecture can be specified with the <option>--host-architecture</" +"option> option instead." msgstr "" "<literal>build-dep</literal> faz o apt-get instalar/remover pacotes numa " "tentativa de satisfazer dependências de compilação para um pacote fonte." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:276 +#: apt-get.8.xml:287 msgid "check" msgstr "check" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:277 +#: apt-get.8.xml:288 msgid "" "<literal>check</literal> is a diagnostic tool; it updates the package cache " "and checks for broken dependencies." @@ -3805,19 +3850,19 @@ msgstr "" "de pacotes e verifica por dependências quebradas." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:281 +#: apt-get.8.xml:292 msgid "download" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:282 +#: apt-get.8.xml:293 msgid "" "<literal>download</literal> will download the given binary package into the " "current directory." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:288 +#: apt-get.8.xml:299 msgid "" "<literal>clean</literal> clears out the local repository of retrieved " "package files. It removes everything but the lock file from " @@ -3836,12 +3881,12 @@ msgstr "" "libertar espaço do disco." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:297 +#: apt-get.8.xml:308 msgid "autoclean" msgstr "autoclean" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:298 +#: apt-get.8.xml:309 msgid "" "Like <literal>clean</literal>, <literal>autoclean</literal> clears out the " "local repository of retrieved package files. The difference is that it only " @@ -3860,28 +3905,33 @@ msgstr "" "pacotes instalados sejam apagados se estiver definida para 'off'." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:307 +#: apt-get.8.xml:318 msgid "autoremove" msgstr "autoremove" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:308 +#: apt-get.8.xml:319 +#, fuzzy +#| msgid "" +#| "<literal>autoremove</literal> is used to remove packages that were " +#| "automatically installed to satisfy dependencies for some package and that " +#| "are no more needed." msgid "" "<literal>autoremove</literal> is used to remove packages that were " -"automatically installed to satisfy dependencies for some package and that " -"are no more needed." +"automatically installed to satisfy dependencies for other packages and are " +"now no longer needed." msgstr "" "<literal>autoremove</literal> é usado para remover pacotes que foram " "instalados automaticamente para satisfazer dependências de algum pacote e " "que já não são necessários." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:312 +#: apt-get.8.xml:323 msgid "changelog" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:313 +#: apt-get.8.xml:324 msgid "" "<literal>changelog</literal> downloads a package changelog and displays it " "through <command>sensible-pager</command>. The server name and base " @@ -3894,12 +3944,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:335 +#: apt-get.8.xml:346 msgid "<option>--no-install-recommends</option>" msgstr "<option>--no-install-recommends</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:336 +#: apt-get.8.xml:347 msgid "" "Do not consider recommended packages as a dependency for installing. " "Configuration Item: <literal>APT::Install-Recommends</literal>." @@ -3908,14 +3958,14 @@ msgstr "" "de Configuração: <literal>APT::Install-Recommends</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:340 +#: apt-get.8.xml:351 #, fuzzy #| msgid "<option>--no-suggests</option>" msgid "<option>--install-suggests</option>" msgstr "<option>--no-suggests</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:341 +#: apt-get.8.xml:352 #, fuzzy #| msgid "" #| "Do not consider recommended packages as a dependency for installing. " @@ -3928,12 +3978,12 @@ msgstr "" "de Configuração: <literal>APT::Install-Recommends</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:345 +#: apt-get.8.xml:356 msgid "<option>--download-only</option>" msgstr "<option>--download-only</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:346 +#: apt-get.8.xml:357 msgid "" "Download only; package files are only retrieved, not unpacked or installed. " "Configuration Item: <literal>APT::Get::Download-Only</literal>." @@ -3943,12 +3993,12 @@ msgstr "" "Download-Only</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:350 +#: apt-get.8.xml:361 msgid "<option>--fix-broken</option>" msgstr "<option>--fix-broken</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:351 +#: apt-get.8.xml:362 msgid "" "Fix; attempt to correct a system with broken dependencies in place. This " "option, when used with install/remove, can omit any packages to permit APT " @@ -3976,17 +4026,17 @@ msgstr "" "<literal>APT::Get::Fix-Broken</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:364 +#: apt-get.8.xml:375 msgid "<option>--ignore-missing</option>" msgstr "<option>--ignore-missing</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:365 +#: apt-get.8.xml:376 msgid "<option>--fix-missing</option>" msgstr "<option>--fix-missing</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:366 +#: apt-get.8.xml:377 msgid "" "Ignore missing packages; If packages cannot be retrieved or fail the " "integrity check after retrieval (corrupted package files), hold back those " @@ -4005,12 +4055,12 @@ msgstr "" "de Configuração: <literal>APT::Get::Fix-Missing</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:376 +#: apt-get.8.xml:387 msgid "<option>--no-download</option>" msgstr "<option>--no-download</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:377 +#: apt-get.8.xml:388 msgid "" "Disables downloading of packages. This is best used with <option>--ignore-" "missing</option> to force APT to use only the .debs it has already " @@ -4021,7 +4071,7 @@ msgstr "" "descarregados. Item de Configuração: <literal>APT::Get::Download</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:384 +#: apt-get.8.xml:395 msgid "" "Quiet; produces output suitable for logging, omitting progress indicators. " "More q's will produce more quiet up to a maximum of 2. You can also use " @@ -4041,17 +4091,17 @@ msgstr "" "<literal>quiet</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:394 +#: apt-get.8.xml:405 msgid "<option>--simulate</option>" msgstr "<option>--simulate</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:396 +#: apt-get.8.xml:407 msgid "<option>--dry-run</option>" msgstr "<option>--dry-run</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:399 +#: apt-get.8.xml:410 msgid "" "No action; perform a simulation of events that would occur but do not " "actually change the system. Configuration Item: <literal>APT::Get::" @@ -4062,7 +4112,7 @@ msgstr "" "Simulate</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:403 +#: apt-get.8.xml:414 msgid "" "Simulation run as user will deactivate locking (<literal>Debug::NoLocking</" "literal>) automatic. Also a notice will be displayed indicating that this " @@ -4080,7 +4130,7 @@ msgstr "" "get</literal>)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:409 +#: apt-get.8.xml:420 msgid "" "Simulate prints out a series of lines each one representing a dpkg " "operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square brackets " @@ -4093,22 +4143,22 @@ msgstr "" "vazios significam quebras que não têm consequência (raro)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:416 +#: apt-get.8.xml:427 msgid "<option>-y</option>" msgstr "<option>-y</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:416 +#: apt-get.8.xml:427 msgid "<option>--yes</option>" msgstr "<option>--yes</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:417 +#: apt-get.8.xml:428 msgid "<option>--assume-yes</option>" msgstr "<option>--assume-yes</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:418 +#: apt-get.8.xml:429 msgid "" "Automatic yes to prompts; assume \"yes\" as answer to all prompts and run " "non-interactively. If an undesirable situation, such as changing a held " @@ -4124,17 +4174,17 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:425 +#: apt-get.8.xml:436 msgid "<option>-u</option>" msgstr "<option>-u</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:425 +#: apt-get.8.xml:436 msgid "<option>--show-upgraded</option>" msgstr "<option>--show-upgraded</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:426 +#: apt-get.8.xml:437 msgid "" "Show upgraded packages; Print out a list of all packages that are to be " "upgraded. Configuration Item: <literal>APT::Get::Show-Upgraded</literal>." @@ -4144,17 +4194,17 @@ msgstr "" "Upgraded</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:431 +#: apt-get.8.xml:442 msgid "<option>-V</option>" msgstr "<option>-V</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:431 +#: apt-get.8.xml:442 msgid "<option>--verbose-versions</option>" msgstr "<option>--verbose-versions</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:432 +#: apt-get.8.xml:443 msgid "" "Show full versions for upgraded and installed packages. Configuration Item: " "<literal>APT::Get::Show-Versions</literal>." @@ -4163,22 +4213,40 @@ msgstr "" "Configuração: <literal>APT::Get::Show-Versions</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:436 +#: apt-get.8.xml:448 +#, fuzzy +#| msgid "<option>--recurse</option>" +msgid "<option>--host-architecture</option>" +msgstr "<option>--recurse</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:449 +msgid "" +"This option controls the architecture packages are built for by <command>apt-" +"get source --compile</command> and how cross-builddependencies are " +"satisfied. By default is it not set which means that the host architecture " +"is the same as the build architecture (which is defined by <literal>APT::" +"Architecture</literal>). Configuration Item: <literal>APT::Get::Host-" +"Architecture</literal>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:457 msgid "<option>-b</option>" msgstr "<option>-b</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:436 +#: apt-get.8.xml:457 msgid "<option>--compile</option>" msgstr "<option>--compile</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:437 +#: apt-get.8.xml:458 msgid "<option>--build</option>" msgstr "<option>--build</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:438 +#: apt-get.8.xml:459 msgid "" "Compile source packages after downloading them. Configuration Item: " "<literal>APT::Get::Compile</literal>." @@ -4187,12 +4255,12 @@ msgstr "" "<literal>APT::Get::Compile</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:442 +#: apt-get.8.xml:463 msgid "<option>--ignore-hold</option>" msgstr "<option>--ignore-hold</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:443 +#: apt-get.8.xml:464 msgid "" "Ignore package Holds; This causes <command>apt-get</command> to ignore a " "hold placed on a package. This may be useful in conjunction with " @@ -4205,12 +4273,12 @@ msgstr "" "Item de Configuração: <literal>APT::Ignore-Hold</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:449 +#: apt-get.8.xml:470 msgid "<option>--no-upgrade</option>" msgstr "<option>--no-upgrade</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:450 +#: apt-get.8.xml:471 msgid "" "Do not upgrade packages; When used in conjunction with <literal>install</" "literal>, <literal>no-upgrade</literal> will prevent packages on the command " @@ -4223,12 +4291,12 @@ msgstr "" "Configuração: <literal>APT::Get::Upgrade</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:456 +#: apt-get.8.xml:477 msgid "<option>--only-upgrade</option>" msgstr "<option>--only-upgrade</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:457 +#: apt-get.8.xml:478 msgid "" "Do not install new packages; When used in conjunction with <literal>install</" "literal>, <literal>only-upgrade</literal> will prevent packages on the " @@ -4241,12 +4309,12 @@ msgstr "" "de Configuração: <literal>APT::Get::Only-Upgrade</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:463 +#: apt-get.8.xml:484 msgid "<option>--force-yes</option>" msgstr "<option>--force-yes</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:464 +#: apt-get.8.xml:485 msgid "" "Force yes; This is a dangerous option that will cause apt to continue " "without prompting if it is doing something potentially harmful. It should " @@ -4261,12 +4329,12 @@ msgstr "" "<literal>APT::Get::force-yes</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:471 +#: apt-get.8.xml:492 msgid "<option>--print-uris</option>" msgstr "<option>--print-uris</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:472 +#: apt-get.8.xml:493 msgid "" "Instead of fetching the files to install their URIs are printed. Each URI " "will have the path, the destination file name, the size and the expected md5 " @@ -4287,12 +4355,12 @@ msgstr "" "Configuração: <literal>APT::Get::Print-URIs</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:482 +#: apt-get.8.xml:503 msgid "<option>--purge</option>" msgstr "<option>--purge</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:483 +#: apt-get.8.xml:504 msgid "" "Use purge instead of remove for anything that would be removed. An asterisk " "(\"*\") will be displayed next to packages which are scheduled to be purged. " @@ -4305,12 +4373,12 @@ msgstr "" "option>. Item de Configuração: <literal>APT::Get::Purge</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:490 +#: apt-get.8.xml:511 msgid "<option>--reinstall</option>" msgstr "<option>--reinstall</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:491 +#: apt-get.8.xml:512 msgid "" "Re-Install packages that are already installed and at the newest version. " "Configuration Item: <literal>APT::Get::ReInstall</literal>." @@ -4319,12 +4387,12 @@ msgstr "" "Configuração: <literal>APT::Get::ReInstall</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:495 +#: apt-get.8.xml:516 msgid "<option>--list-cleanup</option>" msgstr "<option>--list-cleanup</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:496 +#: apt-get.8.xml:517 msgid "" "This option defaults to on, use <literal>--no-list-cleanup</literal> to turn " "it off. When on <command>apt-get</command> will automatically manage the " @@ -4341,17 +4409,17 @@ msgstr "" "fontes. Item de Configuração: <literal>APT::Get::List-Cleanup</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:505 +#: apt-get.8.xml:526 msgid "<option>--target-release</option>" msgstr "<option>--target-release</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:506 +#: apt-get.8.xml:527 msgid "<option>--default-release</option>" msgstr "<option>--default-release</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:507 +#: apt-get.8.xml:528 msgid "" "This option controls the default input to the policy engine, it creates a " "default pin at priority 990 using the specified release string. This " @@ -4374,12 +4442,12 @@ msgstr "" "Release</literal>; veja também o manual &apt-preferences;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:520 +#: apt-get.8.xml:541 msgid "<option>--trivial-only</option>" msgstr "<option>--trivial-only</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:522 +#: apt-get.8.xml:543 msgid "" "Only perform operations that are 'trivial'. Logically this can be considered " "related to <option>--assume-yes</option>, where <option>--assume-yes</" @@ -4393,12 +4461,12 @@ msgstr "" "Trivial-Only</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:528 +#: apt-get.8.xml:549 msgid "<option>--no-remove</option>" msgstr "<option>--no-remove</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:529 +#: apt-get.8.xml:550 msgid "" "If any packages are to be removed apt-get immediately aborts without " "prompting. Configuration Item: <literal>APT::Get::Remove</literal>." @@ -4408,12 +4476,12 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:534 +#: apt-get.8.xml:555 msgid "<option>--auto-remove</option>" msgstr "<option>--auto-remove</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:535 +#: apt-get.8.xml:556 msgid "" "If the command is either <literal>install</literal> or <literal>remove</" "literal>, then this option acts like running <literal>autoremove</literal> " @@ -4426,12 +4494,12 @@ msgstr "" "Configuração: <literal>APT::Get::AutomaticRemove</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:541 +#: apt-get.8.xml:562 msgid "<option>--only-source</option>" msgstr "<option>--only-source</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:542 +#: apt-get.8.xml:563 msgid "" "Only has meaning for the <literal>source</literal> and <literal>build-dep</" "literal> commands. Indicates that the given source names are not to be " @@ -4450,22 +4518,22 @@ msgstr "" "<literal>APT::Get::Only-Source</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:552 +#: apt-get.8.xml:573 msgid "<option>--diff-only</option>" msgstr "<option>--diff-only</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:552 +#: apt-get.8.xml:573 msgid "<option>--dsc-only</option>" msgstr "<option>--dsc-only</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:552 +#: apt-get.8.xml:573 msgid "<option>--tar-only</option>" msgstr "<option>--tar-only</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:553 +#: apt-get.8.xml:574 msgid "" "Download only the diff, dsc, or tar file of a source archive. Configuration " "Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</" @@ -4476,12 +4544,12 @@ msgstr "" "Only</literal>, e <literal>APT::Get::Tar-Only</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:558 +#: apt-get.8.xml:579 msgid "<option>--arch-only</option>" msgstr "<option>--arch-only</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:559 +#: apt-get.8.xml:580 msgid "" "Only process architecture-dependent build-dependencies. Configuration Item: " "<literal>APT::Get::Arch-Only</literal>." @@ -4490,12 +4558,12 @@ msgstr "" "de Configuração: <literal>APT::Get::Arch-Only</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:563 +#: apt-get.8.xml:584 msgid "<option>--allow-unauthenticated</option>" msgstr "<option>--allow-unauthenticated</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:564 +#: apt-get.8.xml:585 msgid "" "Ignore if packages can't be authenticated and don't prompt about it. This " "is useful for tools like pbuilder. Configuration Item: <literal>APT::Get::" @@ -4506,7 +4574,7 @@ msgstr "" "Get::AllowUnauthenticated</literal>." #. type: Content of: <refentry><refsect1><variablelist> -#: apt-get.8.xml:577 +#: apt-get.8.xml:598 msgid "" "&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; " "&file-statelists;" @@ -4515,7 +4583,7 @@ msgstr "" "&file-statelists;" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:586 +#: apt-get.8.xml:607 msgid "" "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, " "&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-" @@ -4526,7 +4594,7 @@ msgstr "" "&guidesdir;, &apt-preferences;, o Howto do APT." #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:592 +#: apt-get.8.xml:613 msgid "" "<command>apt-get</command> returns zero on normal operation, decimal 100 on " "error." @@ -4535,22 +4603,22 @@ msgstr "" "erro." #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:595 +#: apt-get.8.xml:616 msgid "ORIGINAL AUTHORS" msgstr "AUTORES ORIGINAIS" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:596 +#: apt-get.8.xml:617 msgid "&apt-author.jgunthorpe;" msgstr "&apt-author.jgunthorpe;" #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:599 +#: apt-get.8.xml:620 msgid "CURRENT AUTHORS" msgstr "AUTORES ACTUAIS" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:601 +#: apt-get.8.xml:622 msgid "&apt-author.team;" msgstr "&apt-author.team;" @@ -4677,30 +4745,33 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:131 msgid "" -"Update the local keyring with the keyring of Debian archive keys and removes " -"from the keyring the archive keys which are no longer valid." +"Update the local keyring with the archive keyring and remove from the local " +"keyring the archive keys which are no longer valid. The archive keyring is " +"shipped in the <literal>archive-keyring</literal> package of your " +"distribution, e.g. the <literal>debian-archive-keyring</literal> package in " +"Debian." msgstr "" -"Actualiza o chaveiro local com o chaveiro das chaves de arquivos Debian e " -"remove do chaveiro as chaves de arquivo que já não são válidas." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:140 +#: apt-key.8.xml:141 #, fuzzy #| msgid "update" msgid "net-update" msgstr "update" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:144 +#: apt-key.8.xml:145 msgid "" -"Update the local keyring with the keys of a key server and removes from the " -"keyring the archive keys which are no longer valid. This requires an " -"installed wget and an APT build configured to have a server to fetch from. " -"APT in Debian does not support this command, but Ubuntu's APT does." +"Work similar to the <command>update</command> command above, but get the " +"archive keyring from an URI instead and validate it against a master key. " +"This requires an installed &wget; and an APT build configured to have a " +"server to fetch from and a master keyring to validate. APT in Debian does " +"not support this command and relies on <command>update</command> instead, " +"but Ubuntu's APT does." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-key.8.xml:159 +#: apt-key.8.xml:162 msgid "" "Note that options need to be defined before the commands described in the " "previous section." @@ -4709,17 +4780,17 @@ msgstr "" "secção prévia." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:161 +#: apt-key.8.xml:164 msgid "--keyring <replaceable>filename</replaceable>" msgstr "--keyring <replaceable>nome-de-ficheiro</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:162 +#: apt-key.8.xml:165 msgid "" "With this option it is possible to specify a specific keyring file the " "command should operate on. The default is that a command is executed on the " "<filename>trusted.gpg</filename> file as well as on all parts in the " -"<filename>trusted.gpg.d</filename> directory, through <filename>trusted.gpg</" +"<filename>trusted.gpg.d</filename> directory, though <filename>trusted.gpg</" "filename> is the primary keyring which means that e.g. new keys are added to " "this one." msgstr "" @@ -4731,44 +4802,44 @@ msgstr "" "chaves são adicionadas a este." #. type: Content of: <refentry><refsect1><variablelist> -#: apt-key.8.xml:175 +#: apt-key.8.xml:178 msgid "&file-trustedgpg;" msgstr "&file-trustedgpg;" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:177 +#: apt-key.8.xml:180 msgid "<filename>/etc/apt/trustdb.gpg</filename>" msgstr "<filename>/etc/apt/trustdb.gpg</filename>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:178 +#: apt-key.8.xml:181 msgid "Local trust database of archive keys." msgstr "Base de dados local de confiança de chaves de arquivos." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:181 +#: apt-key.8.xml:184 msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:182 +#: apt-key.8.xml:185 msgid "Keyring of Debian archive trusted keys." msgstr "Chaveiro das chaves de confiança dos arquivos Debian." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:185 +#: apt-key.8.xml:188 msgid "" "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" msgstr "" "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:186 +#: apt-key.8.xml:189 msgid "Keyring of Debian archive removed trusted keys." msgstr "Chaveiro das chaves de confiança removidas dos arquivos Debian." #. type: Content of: <refentry><refsect1><para> -#: apt-key.8.xml:195 +#: apt-key.8.xml:198 msgid "&apt-get;, &apt-secure;" msgstr "&apt-get;, &apt-secure;" @@ -5753,13 +5824,24 @@ msgstr "" "analisa listas de pacotes. A predefinição interna é a arquitectura para a " "qual o APT foi compilado." +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:158 +msgid "" +"All Architectures the system supports. Processors implementing the " +"<literal>amd64</literal> are e.g. also able to execute binaries compiled for " +"<literal>i386</literal>; This list is use when fetching files and parsing " +"package lists. The internal default is always the native architecture " +"(<literal>APT::Architecture</literal>) and all foreign architectures it can " +"retrieve by calling <command>dpkg --print-foreign-architectures</command>." +msgstr "" + #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:157 +#: apt.conf.5.xml:165 msgid "Default-Release" msgstr "Default-Release" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:158 +#: apt.conf.5.xml:166 msgid "" "Default release to install packages from if more than one version available. " "Contains release name, codename or release version. Examples: 'stable', " @@ -5772,12 +5854,12 @@ msgstr "" "'&testing-codename;', '4.0', '5.0*'. Veja também &apt-preferences;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:163 +#: apt.conf.5.xml:171 msgid "Ignore-Hold" msgstr "Ignore-Hold" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:164 +#: apt.conf.5.xml:172 msgid "" "Ignore Held packages; This global option causes the problem resolver to " "ignore held packages in its decision making." @@ -5786,12 +5868,12 @@ msgstr "" "os pacotes segurados sejam ignorados na sua decisão de marcação." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:168 +#: apt.conf.5.xml:176 msgid "Clean-Installed" msgstr "Clean-Installed" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:169 +#: apt.conf.5.xml:177 msgid "" "Defaults to on. When turned on the autoclean feature will remove any " "packages which can no longer be downloaded from the cache. If turned off " @@ -5805,12 +5887,12 @@ msgstr "" "directo de os reinstalar." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:175 +#: apt.conf.5.xml:183 msgid "Immediate-Configure" msgstr "Immediate-Configure" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:176 +#: apt.conf.5.xml:184 msgid "" "Defaults to on which will cause APT to install essential and important " "packages as fast as possible in the install/upgrade operation. This is done " @@ -5874,12 +5956,12 @@ msgstr "" "correcção do processo de actualização." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:198 +#: apt.conf.5.xml:206 msgid "Force-LoopBreak" msgstr "Force-LoopBreak" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:199 +#: apt.conf.5.xml:207 msgid "" "Never Enable this option unless you -really- know what you are doing. It " "permits APT to temporarily remove an essential package to break a Conflicts/" @@ -5896,12 +5978,12 @@ msgstr "" "tar, gzip, libc, dpkg, bash ou qualquer coisa de que estes dependem." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:207 +#: apt.conf.5.xml:215 msgid "Cache-Start, Cache-Grow and Cache-Limit" msgstr "Cache-Start, Cache-Grow e Cache-Limit" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:208 +#: apt.conf.5.xml:216 msgid "" "APT uses since version 0.7.26 a resizable memory mapped cache file to store " "the 'available' information. <literal>Cache-Start</literal> acts as a hint " @@ -5938,24 +6020,24 @@ msgstr "" "da cache é desactivado." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:223 +#: apt.conf.5.xml:231 msgid "Build-Essential" msgstr "Build-Essential" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:224 +#: apt.conf.5.xml:232 msgid "Defines which package(s) are considered essential build dependencies." msgstr "" "Define quais pacote(s) são considerados dependências essenciais de " "compilação." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:227 +#: apt.conf.5.xml:235 msgid "Get" msgstr "Get" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:228 +#: apt.conf.5.xml:236 msgid "" "The Get subsection controls the &apt-get; tool, please see its documentation " "for more information about the options here." @@ -5964,12 +6046,12 @@ msgstr "" "documentação para mais informação acerca das opções daqui." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:232 +#: apt.conf.5.xml:240 msgid "Cache" msgstr "Cache" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:233 +#: apt.conf.5.xml:241 msgid "" "The Cache subsection controls the &apt-cache; tool, please see its " "documentation for more information about the options here." @@ -5978,12 +6060,12 @@ msgstr "" "documentação para mais informação acerca das opções daqui." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:237 +#: apt.conf.5.xml:245 msgid "CDROM" msgstr "CDROM" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:238 +#: apt.conf.5.xml:246 msgid "" "The CDROM subsection controls the &apt-cdrom; tool, please see its " "documentation for more information about the options here." @@ -5992,17 +6074,17 @@ msgstr "" "documentação para mais informação acerca das opções de aqui." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:244 +#: apt.conf.5.xml:252 msgid "The Acquire Group" msgstr "O Grupo Acquire" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:249 +#: apt.conf.5.xml:257 msgid "Check-Valid-Until" msgstr "Check-Valid-Until" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:250 +#: apt.conf.5.xml:258 msgid "" "Security related option defaulting to true as an expiring validation for a " "Release file prevents longtime replay attacks and can e.g. also help users " @@ -6023,22 +6105,30 @@ msgstr "" "ValidTime</literal> seguinte." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:260 +#: apt.conf.5.xml:268 msgid "Max-ValidTime" msgstr "Max-ValidTime" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:261 -msgid "" -"Seconds the Release file should be considered valid after it was created. " -"The default is \"for ever\" (0) if the Release file of the archive doesn't " -"include a <literal>Valid-Until</literal> header. If it does then this date " -"is the default. The date from the Release file or the date specified by the " -"creation time of the Release file (<literal>Date</literal> header) plus the " -"seconds specified with this options are used to check if the validation of a " -"file has expired by using the earlier date of the two. Archive specific " -"settings can be made by appending the label of the archive to the option " -"name." +#: apt.conf.5.xml:269 +#, fuzzy +#| msgid "" +#| "Seconds the Release file should be considered valid after it was created. " +#| "The default is \"for ever\" (0) if the Release file of the archive " +#| "doesn't include a <literal>Valid-Until</literal> header. If it does then " +#| "this date is the default. The date from the Release file or the date " +#| "specified by the creation time of the Release file (<literal>Date</" +#| "literal> header) plus the seconds specified with this options are used to " +#| "check if the validation of a file has expired by using the earlier date " +#| "of the two. Archive specific settings can be made by appending the label " +#| "of the archive to the option name." +msgid "" +"Seconds the Release file should be considered valid after it was created " +"(indicated by the <literal>Date</literal> header). If the Release file " +"itself includes a <literal>Valid-Until</literal> header the earlier date of " +"the two is used as the expiration date. The default value is <literal>0</" +"literal> which stands for \"for ever\". Archive specific settings can be " +"made by appending the label of the archive to the option name." msgstr "" "Segundos em que o ficheiro Release deve considerado válido após ser criado. " "A predefinição é \"para sempre\" (0) se o ficheiro Release do arquivo não " @@ -6051,12 +6141,50 @@ msgstr "" "do arquivo ao nome da opção. " #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:273 +#: apt.conf.5.xml:279 +#, fuzzy +#| msgid "Max-ValidTime" +msgid "Min-ValidTime" +msgstr "Max-ValidTime" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:280 +#, fuzzy +#| msgid "" +#| "Seconds the Release file should be considered valid after it was created. " +#| "The default is \"for ever\" (0) if the Release file of the archive " +#| "doesn't include a <literal>Valid-Until</literal> header. If it does then " +#| "this date is the default. The date from the Release file or the date " +#| "specified by the creation time of the Release file (<literal>Date</" +#| "literal> header) plus the seconds specified with this options are used to " +#| "check if the validation of a file has expired by using the earlier date " +#| "of the two. Archive specific settings can be made by appending the label " +#| "of the archive to the option name." +msgid "" +"Minimum of seconds the Release file should be considered valid after it was " +"created (indicated by the <literal>Date</literal> header). Use this if you " +"need to use a seldomly updated (local) mirror of a more regular updated " +"archive with a <literal>Valid-Until</literal> header instead of completely " +"disabling the expiration date checking. Archive specific settings can and " +"should be used by appending the label of the archive to the option name." +msgstr "" +"Segundos em que o ficheiro Release deve considerado válido após ser criado. " +"A predefinição é \"para sempre\" (0) se o ficheiro Release do arquivo não " +"conter um cabeçalho <literal>Valid-Until</literal>. Se o tiver então esta " +"data é a predefinida. A data do ficheiro Release ou a data especificada pela " +"hora de criação do do ficheiro Release (cabeçalho <literal>Date</literal>) " +"mais os segundos especificados com esta opção são usados para verificar se a " +"validação de um ficheiro já expirou ao usar uma data anterior às duas. " +"Definições específicas do Arquivo podem ser feitas ao adicionar a etiqueta " +"do arquivo ao nome da opção. " + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: apt.conf.5.xml:290 msgid "PDiffs" msgstr "PDiffs" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:274 +#: apt.conf.5.xml:291 msgid "" "Try to download deltas called <literal>PDiffs</literal> for Packages or " "Sources files instead of downloading whole ones. True by default." @@ -6066,7 +6194,7 @@ msgstr "" "predefinição." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:277 +#: apt.conf.5.xml:294 msgid "" "Two sub-options to limit the use of PDiffs are also available: With " "<literal>FileLimit</literal> can be specified how many PDiff files are " @@ -6083,12 +6211,12 @@ msgstr "" "limites for excedido, é descarregado o ficheiro completo em vez das patches." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:286 +#: apt.conf.5.xml:303 msgid "Queue-Mode" msgstr "Queue-Mode" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:287 +#: apt.conf.5.xml:304 msgid "" "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</" "literal> or <literal>access</literal> which determines how APT parallelizes " @@ -6103,12 +6231,12 @@ msgstr "" "aberta uma ligação por tipo de URI." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:294 +#: apt.conf.5.xml:311 msgid "Retries" msgstr "Retries" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:295 +#: apt.conf.5.xml:312 msgid "" "Number of retries to perform. If this is non-zero APT will retry failed " "files the given number of times." @@ -6117,12 +6245,12 @@ msgstr "" "tentar, no número fornecido de vezes, obter ficheiros falhados." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:299 +#: apt.conf.5.xml:316 msgid "Source-Symlinks" msgstr "Source-Symlinks" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:300 +#: apt.conf.5.xml:317 msgid "" "Use symlinks for source archives. If set to true then source archives will " "be symlinked when possible instead of copying. True is the default." @@ -6132,12 +6260,12 @@ msgstr "" "A predefinição é verdadeiro." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:304 sources.list.5.xml:144 +#: apt.conf.5.xml:321 sources.list.5.xml:155 msgid "http" msgstr "http" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:305 +#: apt.conf.5.xml:322 msgid "" "HTTP URIs; http::Proxy is the default http proxy to use. It is in the " "standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per " @@ -6154,7 +6282,7 @@ msgstr "" "especificada, será usada a variável de ambiente <envar>http_proxy</envar>." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:313 +#: apt.conf.5.xml:330 msgid "" "Three settings are provided for cache control with HTTP/1.1 compliant proxy " "caches. <literal>No-Cache</literal> tells the proxy to not use its cached " @@ -6179,7 +6307,7 @@ msgstr "" "suporta nenhuma destas opções." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:323 apt.conf.5.xml:387 +#: apt.conf.5.xml:340 apt.conf.5.xml:404 msgid "" "The option <literal>timeout</literal> sets the timeout timer used by the " "method, this applies to all things including connection timeout and data " @@ -6190,7 +6318,7 @@ msgstr "" "e tempos limite de dados." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:326 +#: apt.conf.5.xml:343 msgid "" "One setting is provided to control the pipeline depth in cases where the " "remote server is not RFC conforming or buggy (such as Squid 2.0.2). " @@ -6209,7 +6337,7 @@ msgstr "" "As máquinas que requerem isto estão em violação de RFC 2068." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:334 +#: apt.conf.5.xml:351 msgid "" "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</" "literal> which accepts integer values in kilobyte. The default value is 0 " @@ -6224,7 +6352,7 @@ msgstr "" "múltiplos servidores ao mesmo tempo.)" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:339 +#: apt.conf.5.xml:356 msgid "" "<literal>Acquire::http::User-Agent</literal> can be used to set a different " "User-Agent for the http download method as some proxies allow access for " @@ -6236,12 +6364,12 @@ msgstr "" "identificador conhecido." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:345 +#: apt.conf.5.xml:362 msgid "https" msgstr "https" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:346 +#: apt.conf.5.xml:363 msgid "" "HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy " "options are the same as for <literal>http</literal> method and will also " @@ -6256,7 +6384,7 @@ msgstr "" "literal> ainda não é suportada." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:352 +#: apt.conf.5.xml:369 msgid "" "<literal>CaInfo</literal> suboption specifies place of file that holds info " "about trusted certificates. <literal><host>::CaInfo</literal> is " @@ -6293,12 +6421,12 @@ msgstr "" "host>::SslForceVersion</literal> é a opção po máquina correspondente." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:370 sources.list.5.xml:155 +#: apt.conf.5.xml:387 sources.list.5.xml:166 msgid "ftp" msgstr "ftp" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:371 +#: apt.conf.5.xml:388 msgid "" "FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard " "form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host " @@ -6331,7 +6459,7 @@ msgstr "" "$(SITE_PORT)</literal>. Cada uma é tirada do seu componente URI respectivo." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:390 +#: apt.conf.5.xml:407 msgid "" "Several settings are provided to control passive mode. Generally it is safe " "to leave passive mode on, it works in nearly every environment. However " @@ -6347,7 +6475,7 @@ msgstr "" "específica (Veja a amostra de ficheiro de configuração para exemplos)." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:397 +#: apt.conf.5.xml:414 msgid "" "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</" "envar> environment variable to a http url - see the discussion of the http " @@ -6361,7 +6489,7 @@ msgstr "" "eficiência." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:402 +#: apt.conf.5.xml:419 msgid "" "The setting <literal>ForceExtended</literal> controls the use of RFC2428 " "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is " @@ -6376,18 +6504,18 @@ msgstr "" "ligações IPv4. Note que a maioria dos servidores FTP não suporta RFC2428." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:409 sources.list.5.xml:137 +#: apt.conf.5.xml:426 sources.list.5.xml:148 msgid "cdrom" msgstr "cdrom" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:415 +#: apt.conf.5.xml:432 #, no-wrap msgid "/cdrom/::Mount \"foo\";" msgstr "/cdrom/::Mount \"foo\";" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:410 +#: apt.conf.5.xml:427 msgid "" "CDROM URIs; the only setting for CDROM URIs is the mount point, " "<literal>cdrom::Mount</literal> which must be the mount point for the CDROM " @@ -6408,12 +6536,12 @@ msgstr "" "Comandos para desmontar podem ser especificados usando UMount." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:420 +#: apt.conf.5.xml:437 msgid "gpgv" msgstr "gpgv" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:421 +#: apt.conf.5.xml:438 msgid "" "GPGV URIs; the only option for GPGV URIs is the option to pass additional " "parameters to gpgv. <literal>gpgv::Options</literal> Additional options " @@ -6424,18 +6552,18 @@ msgstr "" "passadas ao gpgv." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:426 +#: apt.conf.5.xml:443 msgid "CompressionTypes" msgstr "CompressionTypes" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:432 +#: apt.conf.5.xml:449 #, no-wrap msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";" msgstr "Acquire::CompressionTypes::<replaceable>Extensão de Ficheiro</replaceable> \"<replaceable>Nome de método</replaceable>\";" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:427 +#: apt.conf.5.xml:444 msgid "" "List of compression types which are understood by the acquire methods. " "Files like <filename>Packages</filename> can be available in various " @@ -6454,19 +6582,19 @@ msgstr "" "alterado. A sintaxe para isto é: <placeholder type=\"synopsis\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:437 +#: apt.conf.5.xml:454 #, no-wrap msgid "Acquire::CompressionTypes::Order:: \"gz\";" msgstr "Acquire::CompressionTypes::Order:: \"gz\";" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:440 +#: apt.conf.5.xml:457 #, no-wrap msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:433 +#: apt.conf.5.xml:450 msgid "" "Also the <literal>Order</literal> subgroup can be used to define in which " "order the acquire system will try to download the compressed files. The " @@ -6497,13 +6625,13 @@ msgstr "" "lista pois será adicionado automaticamente." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:444 +#: apt.conf.5.xml:461 #, no-wrap msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:442 +#: apt.conf.5.xml:459 #, fuzzy #| msgid "" #| "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</" @@ -6540,7 +6668,7 @@ msgstr "" "sobrepor a lista definida, irá apenas prefixar a lista com este tipo." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:449 +#: apt.conf.5.xml:466 msgid "" "The special type <literal>uncompressed</literal> can be used to give " "uncompressed files a preference, but note that most archives don't provide " @@ -6548,12 +6676,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:454 +#: apt.conf.5.xml:471 msgid "GzipIndexes" msgstr "GzipIndexes" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:456 +#: apt.conf.5.xml:473 msgid "" "When downloading <literal>gzip</literal> compressed indexes (Packages, " "Sources, or Translations), keep them gzip compressed locally instead of " @@ -6566,12 +6694,12 @@ msgstr "" "CPU quando constrói as caches de pacotes locais. Falso por predefinição." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:463 +#: apt.conf.5.xml:480 msgid "Languages" msgstr "Languages" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:464 +#: apt.conf.5.xml:481 msgid "" "The Languages subsection controls which <filename>Translation</filename> " "files are downloaded and in which order APT tries to display the Description-" @@ -6593,13 +6721,13 @@ msgstr "" "de definir aqui valores impossíveis." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting> -#: apt.conf.5.xml:480 +#: apt.conf.5.xml:497 #, no-wrap msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" msgstr "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:470 +#: apt.conf.5.xml:487 msgid "" "The default list includes \"environment\" and \"en\". " "\"<literal>environment</literal>\" has a special meaning here: It will be " @@ -6639,7 +6767,7 @@ msgstr "" "ser \"fr, de, en\". <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:245 +#: apt.conf.5.xml:253 msgid "" "The <literal>Acquire</literal> group of options controls the download of " "packages and the URI handlers. <placeholder type=\"variablelist\" id=\"0\"/>" @@ -6648,12 +6776,12 @@ msgstr "" "e os manipuladores de URI. <placeholder type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:487 +#: apt.conf.5.xml:504 msgid "Directories" msgstr "Directories" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:489 +#: apt.conf.5.xml:506 msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " "local state information. <literal>lists</literal> is the directory to place " @@ -6672,7 +6800,7 @@ msgstr "" "com <filename>/</filename> ou <filename>./</filename>." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:496 +#: apt.conf.5.xml:513 msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " "information, such as the two package caches <literal>srcpkgcache</literal> " @@ -6693,7 +6821,7 @@ msgstr "" "literal> o directório predefinido é contido em <literal>Dir::Cache</literal>" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:505 +#: apt.conf.5.xml:522 msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " "<literal>sourcelist</literal> gives the location of the sourcelist and " @@ -6708,7 +6836,7 @@ msgstr "" "ficheiro de configuração especificado por <envar>APT_CONFIG</envar>)." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:511 +#: apt.conf.5.xml:528 msgid "" "The <literal>Dir::Parts</literal> setting reads in all the config fragments " "in lexical order from the directory specified. After this is done then the " @@ -6719,7 +6847,7 @@ msgstr "" "estar feito então é carregado o ficheiro de configuração principal." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:515 +#: apt.conf.5.xml:532 msgid "" "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::" "Bin::Methods</literal> specifies the location of the method handlers and " @@ -6737,7 +6865,7 @@ msgstr "" "respectivos programas." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:523 +#: apt.conf.5.xml:540 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@ -6758,7 +6886,7 @@ msgstr "" "procurado em <filename>/tmp/staging/var/lib/dpkg/status</filename>." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:536 +#: apt.conf.5.xml:553 msgid "" "The <literal>Ignore-Files-Silently</literal> list can be used to specify " "which files APT should silently ignore while parsing the files in the " @@ -6776,12 +6904,12 @@ msgstr "" "expressão regular." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:545 +#: apt.conf.5.xml:562 msgid "APT in DSelect" msgstr "APT em DSelect" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:547 +#: apt.conf.5.xml:564 msgid "" "When APT is used as a &dselect; method several configuration directives " "control the default behaviour. These are in the <literal>DSelect</literal> " @@ -6792,12 +6920,12 @@ msgstr "" "<literal>DSelect</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:551 +#: apt.conf.5.xml:568 msgid "Clean" msgstr "Clean" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:552 +#: apt.conf.5.xml:569 msgid "" "Cache Clean mode; this value may be one of always, prompt, auto, pre-auto " "and never. always and prompt will remove all packages from the cache after " @@ -6814,7 +6942,7 @@ msgstr "" "descarregar novos pacotes." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:561 +#: apt.conf.5.xml:578 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the install phase." @@ -6823,12 +6951,12 @@ msgstr "" "comandos quando é corrido para a fase de instalação." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:565 +#: apt.conf.5.xml:582 msgid "Updateoptions" msgstr "Updateoptions" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:566 +#: apt.conf.5.xml:583 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the update phase." @@ -6837,12 +6965,12 @@ msgstr "" "comandos quando é executado para a fase de actualização." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:570 +#: apt.conf.5.xml:587 msgid "PromptAfterUpdate" msgstr "PromptAfterUpdate" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:571 +#: apt.conf.5.xml:588 msgid "" "If true the [U]pdate operation in &dselect; will always prompt to continue. " "The default is to prompt only on error." @@ -6851,12 +6979,12 @@ msgstr "" "continuar. A predefinição é avisar apenas em caso de erro." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:577 +#: apt.conf.5.xml:594 msgid "How APT calls dpkg" msgstr "Como o APT chama o dpkg" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:578 +#: apt.conf.5.xml:595 msgid "" "Several configuration directives control how APT invokes &dpkg;. These are " "in the <literal>DPkg</literal> section." @@ -6865,7 +6993,7 @@ msgstr "" "&dpkg;. Estas estão na secção <literal>DPkg</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:583 +#: apt.conf.5.xml:600 msgid "" "This is a list of options to pass to dpkg. The options must be specified " "using the list notation and each list item is passed as a single argument to " @@ -6876,17 +7004,17 @@ msgstr "" "um argumento único ao &dpkg;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:588 +#: apt.conf.5.xml:605 msgid "Pre-Invoke" msgstr "Pre-Invoke" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:588 +#: apt.conf.5.xml:605 msgid "Post-Invoke" msgstr "Post-Invoke" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:589 +#: apt.conf.5.xml:606 msgid "" "This is a list of shell commands to run before/after invoking &dpkg;. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -6899,12 +7027,12 @@ msgstr "" "bin/sh</filename>, caso algum deles falhe, o APT irá abortar." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:595 +#: apt.conf.5.xml:612 msgid "Pre-Install-Pkgs" msgstr "Pre-Install-Pkgs" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:596 +#: apt.conf.5.xml:613 msgid "" "This is a list of shell commands to run before invoking dpkg. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -6920,7 +7048,7 @@ msgstr "" "deb que vai instalar, um por cada linha." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:602 +#: apt.conf.5.xml:619 msgid "" "Version 2 of this protocol dumps more information, including the protocol " "version, the APT configuration space and the packages, files and versions " @@ -6935,12 +7063,12 @@ msgstr "" "dado ao <literal>Pre-Install-Pkgs</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:609 +#: apt.conf.5.xml:626 msgid "Run-Directory" msgstr "Run-Directory" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:610 +#: apt.conf.5.xml:627 msgid "" "APT chdirs to this directory before invoking dpkg, the default is <filename>/" "</filename>." @@ -6949,12 +7077,12 @@ msgstr "" "predefinição é <filename>/</filename>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:614 +#: apt.conf.5.xml:631 msgid "Build-options" msgstr "Build-options" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:615 +#: apt.conf.5.xml:632 msgid "" "These options are passed to &dpkg-buildpackage; when compiling packages, the " "default is to disable signing and produce all binaries." @@ -6963,12 +7091,12 @@ msgstr "" "predefinição é desactivar a assinatura e produzir todos os binários." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt.conf.5.xml:620 +#: apt.conf.5.xml:637 msgid "dpkg trigger usage (and related options)" msgstr "Utilização trigger do dpkg (e opções relacionadas)" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:621 +#: apt.conf.5.xml:638 #, fuzzy #| msgid "" #| "APT can call dpkg in a way so it can make aggressive use of triggers over " @@ -7007,7 +7135,7 @@ msgstr "" "todos os pacotes." #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> -#: apt.conf.5.xml:636 +#: apt.conf.5.xml:653 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@ -7021,7 +7149,7 @@ msgstr "" "DPkg::TriggersPending \"true\";" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:630 +#: apt.conf.5.xml:647 msgid "" "Note that it is not guaranteed that APT will support these options or that " "these options will not cause (big) trouble in the future. If you have " @@ -7045,12 +7173,12 @@ msgstr "" "\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:642 +#: apt.conf.5.xml:659 msgid "DPkg::NoTriggers" msgstr "DPkg::NoTriggers" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:643 +#: apt.conf.5.xml:660 msgid "" "Add the no triggers flag to all dpkg calls (except the ConfigurePending " "call). See &dpkg; if you are interested in what this actually means. In " @@ -7071,12 +7199,12 @@ msgstr "" "chamadas unpack e remove." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:650 +#: apt.conf.5.xml:667 msgid "PackageManager::Configure" msgstr "PackageManager::Configure" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:651 +#: apt.conf.5.xml:668 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default " @@ -7104,12 +7232,12 @@ msgstr "" "poderia não arrancar!" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:661 +#: apt.conf.5.xml:678 msgid "DPkg::ConfigurePending" msgstr "DPkg::ConfigurePending" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:662 +#: apt.conf.5.xml:679 msgid "" "If this option is set apt will call <command>dpkg --configure --pending</" "command> to let dpkg handle all required configurations and triggers. This " @@ -7127,12 +7255,12 @@ msgstr "" "esta opção em todas excepto na última execução." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:668 +#: apt.conf.5.xml:685 msgid "DPkg::TriggersPending" msgstr "DPkg::TriggersPending" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:669 +#: apt.conf.5.xml:686 msgid "" "Useful for <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal> and dpkg " @@ -7148,12 +7276,12 @@ msgstr "" "configurar este pacote." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:674 +#: apt.conf.5.xml:691 msgid "PackageManager::UnpackAll" msgstr "PackageManager::UnpackAll" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:675 +#: apt.conf.5.xml:692 msgid "" "As the configuration can be deferred to be done at the end by dpkg it can be " "tried to order the unpack series only by critical needs, e.g. by Pre-" @@ -7172,12 +7300,12 @@ msgstr "" "experimental e necessita de mais melhorias antes de se tornar realmente útil." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:682 +#: apt.conf.5.xml:699 msgid "OrderList::Score::Immediate" msgstr "OrderList::Score::Immediate" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:690 +#: apt.conf.5.xml:707 #, no-wrap msgid "" "OrderList::Score {\n" @@ -7195,7 +7323,7 @@ msgstr "" "};" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:683 +#: apt.conf.5.xml:700 msgid "" "Essential packages (and there dependencies) should be configured immediately " "after unpacking. It will be a good idea to do this quite early in the " @@ -7219,12 +7347,12 @@ msgstr "" "predefinidos. <placeholder type=\"literallayout\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:703 +#: apt.conf.5.xml:720 msgid "Periodic and Archives options" msgstr "Opções Periodic e Archives" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:704 +#: apt.conf.5.xml:721 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by " @@ -7237,12 +7365,12 @@ msgstr "" "Veja o cabeçalho deste script para uma breve documentação das suas opções." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:712 +#: apt.conf.5.xml:729 msgid "Debug options" msgstr "Opções de depuração" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:714 +#: apt.conf.5.xml:731 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@ -7259,7 +7387,7 @@ msgstr "" "interesse para o utilizador normal, mas algumas podem ter:" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:725 +#: apt.conf.5.xml:742 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</" @@ -7270,7 +7398,7 @@ msgstr "" "remove, purge</literal>." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:733 +#: apt.conf.5.xml:750 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s install</" @@ -7281,7 +7409,7 @@ msgstr "" "<literal>apt-get -s install</literal>) como um utilizador não root." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:742 +#: apt.conf.5.xml:759 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@ -7293,7 +7421,7 @@ msgstr "" #. motivating example, except I haven't a clue why you'd want #. to do this. #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:750 +#: apt.conf.5.xml:767 msgid "" "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " "in CDROM IDs." @@ -7302,17 +7430,17 @@ msgstr "" "IDs de CDROM." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:760 +#: apt.conf.5.xml:777 msgid "A full list of debugging options to apt follows." msgstr "Segue-se uma lista completa de opções de depuração para o apt." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:765 +#: apt.conf.5.xml:782 msgid "<literal>Debug::Acquire::cdrom</literal>" msgstr "<literal>Debug::Acquire::cdrom</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:769 +#: apt.conf.5.xml:786 msgid "" "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" @@ -7320,45 +7448,45 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:776 +#: apt.conf.5.xml:793 msgid "<literal>Debug::Acquire::ftp</literal>" msgstr "<literal>Debug::Acquire::ftp</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:780 +#: apt.conf.5.xml:797 msgid "Print information related to downloading packages using FTP." msgstr "" "Escreve informação relacionada com o descarregamento de pacotes usando FTP." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:787 +#: apt.conf.5.xml:804 msgid "<literal>Debug::Acquire::http</literal>" msgstr "<literal>Debug::Acquire::http</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:791 +#: apt.conf.5.xml:808 msgid "Print information related to downloading packages using HTTP." msgstr "" "Escreve informação relacionada com o descarregamento de pacotes usando HTTP." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:798 +#: apt.conf.5.xml:815 msgid "<literal>Debug::Acquire::https</literal>" msgstr "<literal>Debug::Acquire::https</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:802 +#: apt.conf.5.xml:819 msgid "Print information related to downloading packages using HTTPS." msgstr "" "Escreve informação relacionada com o descarregamento de pacotes usando HTTPS." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:809 +#: apt.conf.5.xml:826 msgid "<literal>Debug::Acquire::gpgv</literal>" msgstr "<literal>Debug::Acquire::gpgv</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:813 +#: apt.conf.5.xml:830 msgid "" "Print information related to verifying cryptographic signatures using " "<literal>gpg</literal>." @@ -7367,12 +7495,12 @@ msgstr "" "criptográficas usando <literal>gpg</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:820 +#: apt.conf.5.xml:837 msgid "<literal>Debug::aptcdrom</literal>" msgstr "<literal>Debug::aptcdrom</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:824 +#: apt.conf.5.xml:841 msgid "" "Output information about the process of accessing collections of packages " "stored on CD-ROMs." @@ -7381,23 +7509,23 @@ msgstr "" "armazenados em CD-ROMs." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:831 +#: apt.conf.5.xml:848 msgid "<literal>Debug::BuildDeps</literal>" msgstr "<literal>Debug::BuildDeps</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:834 +#: apt.conf.5.xml:851 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" "Descreve os processos de resolver dependências de compilação no &apt-get;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:841 +#: apt.conf.5.xml:858 msgid "<literal>Debug::Hashes</literal>" msgstr "<literal>Debug::Hashes</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:844 +#: apt.conf.5.xml:861 msgid "" "Output each cryptographic hash that is generated by the <literal>apt</" "literal> libraries." @@ -7406,12 +7534,12 @@ msgstr "" "<literal>apt</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:851 +#: apt.conf.5.xml:868 msgid "<literal>Debug::IdentCDROM</literal>" msgstr "<literal>Debug::IdentCDROM</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:854 +#: apt.conf.5.xml:871 msgid "" "Do not include information from <literal>statfs</literal>, namely the number " "of used and free blocks on the CD-ROM filesystem, when generating an ID for " @@ -7422,12 +7550,12 @@ msgstr "" "para um CD-ROM." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:862 +#: apt.conf.5.xml:879 msgid "<literal>Debug::NoLocking</literal>" msgstr "<literal>Debug::NoLocking</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:865 +#: apt.conf.5.xml:882 msgid "" "Disable all file locking. For instance, this will allow two instances of " "<quote><literal>apt-get update</literal></quote> to run at the same time." @@ -7437,24 +7565,24 @@ msgstr "" "literal></quote> ao mesmo tempo." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:873 +#: apt.conf.5.xml:890 msgid "<literal>Debug::pkgAcquire</literal>" msgstr "<literal>Debug::pkgAcquire</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:877 +#: apt.conf.5.xml:894 msgid "Log when items are added to or removed from the global download queue." msgstr "" "Regista no log quando os items são adicionados ou removidos da fila de " "download global." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:884 +#: apt.conf.5.xml:901 msgid "<literal>Debug::pkgAcquire::Auth</literal>" msgstr "<literal>Debug::pkgAcquire::Auth</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:887 +#: apt.conf.5.xml:904 msgid "" "Output status messages and errors related to verifying checksums and " "cryptographic signatures of downloaded files." @@ -7463,12 +7591,12 @@ msgstr "" "checksums e assinaturas criptográficas dos ficheiros descarregados." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:894 +#: apt.conf.5.xml:911 msgid "<literal>Debug::pkgAcquire::Diffs</literal>" msgstr "<literal>Debug::pkgAcquire::Diffs</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:897 +#: apt.conf.5.xml:914 msgid "" "Output information about downloading and applying package index list diffs, " "and errors relating to package index list diffs." @@ -7478,12 +7606,12 @@ msgstr "" "pacote." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:905 +#: apt.conf.5.xml:922 msgid "<literal>Debug::pkgAcquire::RRed</literal>" msgstr "<literal>Debug::pkgAcquire::RRed</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:909 +#: apt.conf.5.xml:926 msgid "" "Output information related to patching apt package lists when downloading " "index diffs instead of full indices." @@ -7492,12 +7620,12 @@ msgstr "" "do apt quando se descarrega diffs de índice em vez de índices completos." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:916 +#: apt.conf.5.xml:933 msgid "<literal>Debug::pkgAcquire::Worker</literal>" msgstr "<literal>Debug::pkgAcquire::Worker</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:920 +#: apt.conf.5.xml:937 msgid "" "Log all interactions with the sub-processes that actually perform downloads." msgstr "" @@ -7505,12 +7633,12 @@ msgstr "" "downloads." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:927 +#: apt.conf.5.xml:944 msgid "<literal>Debug::pkgAutoRemove</literal>" msgstr "<literal>Debug::pkgAutoRemove</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:931 +#: apt.conf.5.xml:948 msgid "" "Log events related to the automatically-installed status of packages and to " "the removal of unused packages." @@ -7519,12 +7647,12 @@ msgstr "" "de pacotes e com a remoção de pacotes não utilizados." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:938 +#: apt.conf.5.xml:955 msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>" msgstr "<literal>Debug::pkgDepCache::AutoInstall</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:941 +#: apt.conf.5.xml:958 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial auto-" @@ -7539,12 +7667,12 @@ msgstr "" "literal>; veja <literal>Debug::pkgProblemResolver</literal> para isso." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:952 +#: apt.conf.5.xml:969 msgid "<literal>Debug::pkgDepCache::Marker</literal>" msgstr "<literal>Debug::pkgDepCache::Marker</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:955 +#: apt.conf.5.xml:972 msgid "" "Generate debug messages describing which package is marked as keep/install/" "remove while the ProblemResolver does his work. Each addition or deletion " @@ -7574,22 +7702,22 @@ msgstr "" "pacote aparece." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:974 +#: apt.conf.5.xml:991 msgid "<literal>Debug::pkgInitConfig</literal>" msgstr "<literal>Debug::pkgInitConfig</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:977 +#: apt.conf.5.xml:994 msgid "Dump the default configuration to standard error on startup." msgstr "Despeja a configuração predefinida para o erro standard no arranque." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:984 +#: apt.conf.5.xml:1001 msgid "<literal>Debug::pkgDPkgPM</literal>" msgstr "<literal>Debug::pkgDPkgPM</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:987 +#: apt.conf.5.xml:1004 msgid "" "When invoking &dpkg;, output the precise command line with which it is being " "invoked, with arguments separated by a single space character." @@ -7599,12 +7727,12 @@ msgstr "" "único." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:995 +#: apt.conf.5.xml:1012 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" msgstr "<literal>Debug::pkgDPkgProgressReporting</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:998 +#: apt.conf.5.xml:1015 msgid "" "Output all the data received from &dpkg; on the status file descriptor and " "any errors encountered while parsing it." @@ -7613,12 +7741,12 @@ msgstr "" "estado e quaisquer erros encontrados enquanto os analisa." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1005 +#: apt.conf.5.xml:1022 msgid "<literal>Debug::pkgOrderList</literal>" msgstr "<literal>Debug::pkgOrderList</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1009 +#: apt.conf.5.xml:1026 msgid "" "Generate a trace of the algorithm that decides the order in which " "<literal>apt</literal> should pass packages to &dpkg;." @@ -7627,12 +7755,12 @@ msgstr "" "literal> deve passar os pacotes ao &dpkg;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1017 +#: apt.conf.5.xml:1034 msgid "<literal>Debug::pkgPackageManager</literal>" msgstr "<literal>Debug::pkgPackageManager</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1021 +#: apt.conf.5.xml:1038 msgid "" "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "" @@ -7640,22 +7768,22 @@ msgstr "" "&dpkg;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1028 +#: apt.conf.5.xml:1045 msgid "<literal>Debug::pkgPolicy</literal>" msgstr "<literal>Debug::pkgPolicy</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1032 +#: apt.conf.5.xml:1049 msgid "Output the priority of each package list on startup." msgstr "Escreve a prioridade da cada lista de pacote no arranque." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1038 +#: apt.conf.5.xml:1055 msgid "<literal>Debug::pkgProblemResolver</literal>" msgstr "<literal>Debug::pkgProblemResolver</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1042 +#: apt.conf.5.xml:1059 msgid "" "Trace the execution of the dependency resolver (this applies only to what " "happens when a complex dependency problem is encountered)." @@ -7664,12 +7792,12 @@ msgstr "" "acontece quando é encontrado um problema de dependências complexo)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1050 +#: apt.conf.5.xml:1067 msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>" msgstr "<literal>Debug::pkgProblemResolver::ShowScores</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1053 +#: apt.conf.5.xml:1070 msgid "" "Display a list of all installed packages with their calculated score used by " "the pkgProblemResolver. The description of the package is the same as " @@ -7680,12 +7808,12 @@ msgstr "" "mesma que é descrita em <literal>Debug::pkgDepCache::Marker</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1061 +#: apt.conf.5.xml:1078 msgid "<literal>Debug::sourceList</literal>" msgstr "<literal>Debug::sourceList</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1065 +#: apt.conf.5.xml:1082 msgid "" "Print information about the vendors read from <filename>/etc/apt/vendors." "list</filename>." @@ -7694,7 +7822,7 @@ msgstr "" "vendors.list</filename>." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1088 +#: apt.conf.5.xml:1105 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." @@ -7703,13 +7831,13 @@ msgstr "" "para todas as opções possíveis." #. type: Content of: <refentry><refsect1><variablelist> -#: apt.conf.5.xml:1095 +#: apt.conf.5.xml:1112 msgid "&file-aptconf;" msgstr "&file-aptconf;" #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1100 +#: apt.conf.5.xml:1117 msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "&apt-cache;, &apt-config;, &apt-preferences;." @@ -9235,8 +9363,9 @@ msgstr "" #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml:81 -#, no-wrap -msgid "deb uri distribution [component1] [component2] [...]" +#, fuzzy, no-wrap +#| msgid "deb uri distribution [component1] [component2] [...]" +msgid "deb [ options ] uri distribution [component1] [component2] [...]" msgstr "deb uri distribuição [componente1] [componente2] [...]" #. type: Content of: <refentry><refsect1><para> @@ -9307,6 +9436,27 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:112 msgid "" +"<literal>options</literal> is always optional and needs to be surounded by " +"square brackets. It can consist of multiple settings in the form " +"<literal><replaceable>setting</replaceable>=<replaceable>value</" +"replaceable></literal>. Multiple settings are separated by spaces. The " +"following settings are supported by APT, note though that unsupported " +"settings will be ignored silently:" +msgstr "" + +#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> +#: sources.list.5.xml:117 +msgid "" +"<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</" +"replaceable>,…</literal> can be used to specify for which architectures " +"packages information should be downloaded. If this option is not set all " +"architectures defined by the <literal>APT::Architectures</literal> option " +"will be downloaded." +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:123 +msgid "" "It is important to list sources in order of preference, with the most " "preferred source listed first. Typically this will result in sorting by " "speed from fastest to slowest (CD-ROM followed by hosts on a local network, " @@ -9319,12 +9469,12 @@ msgstr "" "Internet, por exemplo)." #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:117 +#: sources.list.5.xml:128 msgid "Some examples:" msgstr "Alguns exemplos:" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:119 +#: sources.list.5.xml:130 #, no-wrap msgid "" "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n" @@ -9336,17 +9486,17 @@ msgstr "" " " #. type: Content of: <refentry><refsect1><title> -#: sources.list.5.xml:125 +#: sources.list.5.xml:136 msgid "URI specification" msgstr "Especificação da URI" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: sources.list.5.xml:130 +#: sources.list.5.xml:141 msgid "file" msgstr "file" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:132 +#: sources.list.5.xml:143 msgid "" "The file scheme allows an arbitrary directory in the file system to be " "considered an archive. This is useful for NFS mounts and local mirrors or " @@ -9357,7 +9507,7 @@ msgstr "" "arquivos locais." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:139 +#: sources.list.5.xml:150 msgid "" "The cdrom scheme allows APT to use a local CDROM drive with media swapping. " "Use the &apt-cdrom; program to create cdrom entries in the source list." @@ -9367,7 +9517,7 @@ msgstr "" "fontes." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:146 +#: sources.list.5.xml:157 msgid "" "The http scheme specifies an HTTP server for the archive. If an environment " "variable <envar>http_proxy</envar> is set with the format http://server:" @@ -9384,7 +9534,7 @@ msgstr "" "método de autenticação seguro." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:157 +#: sources.list.5.xml:168 msgid "" "The ftp scheme specifies an FTP server for the archive. APT's FTP behavior " "is highly configurable; for more information see the &apt-conf; manual page. " @@ -9403,12 +9553,12 @@ msgstr "" "especificados no ficheiro de configuração serão ignorados." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: sources.list.5.xml:166 +#: sources.list.5.xml:177 msgid "copy" msgstr "copy" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:168 +#: sources.list.5.xml:179 msgid "" "The copy scheme is identical to the file scheme except that packages are " "copied into the cache directory instead of used directly at their location. " @@ -9420,17 +9570,17 @@ msgstr "" "com o APT." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: sources.list.5.xml:173 +#: sources.list.5.xml:184 msgid "rsh" msgstr "rsh" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: sources.list.5.xml:173 +#: sources.list.5.xml:184 msgid "ssh" msgstr "ssh" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:175 +#: sources.list.5.xml:186 msgid "" "The rsh/ssh method invokes rsh/ssh to connect to a remote host as a given " "user and access the files. It is a good idea to do prior arrangements with " @@ -9445,12 +9595,12 @@ msgstr "" "para executar as transferências de ficheiros remotos." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: sources.list.5.xml:183 +#: sources.list.5.xml:194 msgid "more recognizable URI types" msgstr "tipos de URI mais reconhecíveis" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:185 +#: sources.list.5.xml:196 msgid "" "APT can be extended with more methods shipped in other optional packages " "which should follow the nameing scheme <literal>apt-transport-" @@ -9472,7 +9622,7 @@ msgstr "" "<manvolnum>1</manvolnum></citerefentry>." #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:127 +#: sources.list.5.xml:138 msgid "" "The currently recognized URI types are cdrom, file, http, ftp, copy, ssh, " "rsh. <placeholder type=\"variablelist\" id=\"0\"/>" @@ -9481,7 +9631,7 @@ msgstr "" "ssh, rsh. <placeholder type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:199 +#: sources.list.5.xml:210 msgid "" "Uses the archive stored locally (or NFS mounted) at /home/jason/debian for " "stable/main, stable/contrib, and stable/non-free." @@ -9490,36 +9640,59 @@ msgstr "" "para stable/main, stable/contrib, e stable/non-free." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:201 +#: sources.list.5.xml:212 #, no-wrap msgid "deb file:/home/jason/debian stable main contrib non-free" msgstr "deb file:/home/jason/debian stable main contrib non-free" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:203 +#: sources.list.5.xml:214 msgid "As above, except this uses the unstable (development) distribution." msgstr "" "Como em cima, excepto que usa a distribuição unstable (de desenvolvimento)." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:204 +#: sources.list.5.xml:215 #, no-wrap msgid "deb file:/home/jason/debian unstable main contrib non-free" msgstr "deb file:/home/jason/debian unstable main contrib non-free" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:206 +#: sources.list.5.xml:217 msgid "Source line for the above" msgstr "Linha de fonte para o referido acima" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:207 +#: sources.list.5.xml:218 #, no-wrap msgid "deb-src file:/home/jason/debian unstable main contrib non-free" msgstr "deb-src file:/home/jason/debian unstable main contrib non-free" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:209 +#: sources.list.5.xml:220 +msgid "" +"The first line gets package information for the architectures in " +"<literal>APT::Architectures</literal> while the second always retrieves " +"<literal>amd64</literal> and <literal>armel</literal>." +msgstr "" + +#. type: Content of: <refentry><refsect1><literallayout> +#: sources.list.5.xml:222 +#, fuzzy, no-wrap +#| msgid "" +#| "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n" +#| "deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n" +#| " " +msgid "" +"deb http://ftp.debian.org/debian &stable-codename; main\n" +"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main" +msgstr "" +"deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n" +"deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n" +" " + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:225 msgid "" "Uses HTTP to access the archive at archive.debian.org, and uses only the " "hamm/main area." @@ -9528,13 +9701,13 @@ msgstr "" "hamm/main." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:211 +#: sources.list.5.xml:227 #, no-wrap msgid "deb http://archive.debian.org/debian-archive hamm main" msgstr "deb http://archive.debian.org/debian-archive hamm main" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:213 +#: sources.list.5.xml:229 msgid "" "Uses FTP to access the archive at ftp.debian.org, under the debian " "directory, and uses only the &stable-codename;/contrib area." @@ -9543,13 +9716,13 @@ msgstr "" "usa apenas a área &stable-codename;/contrib." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:215 +#: sources.list.5.xml:231 #, no-wrap msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib" msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:217 +#: sources.list.5.xml:233 msgid "" "Uses FTP to access the archive at ftp.debian.org, under the debian " "directory, and uses only the unstable/contrib area. If this line appears as " @@ -9562,20 +9735,20 @@ msgstr "" "uma única sessão FTP para ambas linhas de recurso." #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:221 +#: sources.list.5.xml:237 #, no-wrap msgid "deb ftp://ftp.debian.org/debian unstable contrib" msgstr "deb ftp://ftp.debian.org/debian unstable contrib" #. type: Content of: <refentry><refsect1><para><literallayout> -#: sources.list.5.xml:230 +#: sources.list.5.xml:246 #, fuzzy, no-wrap #| msgid "deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/" msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/" msgstr "deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:223 +#: sources.list.5.xml:239 #, fuzzy #| msgid "" #| "Uses HTTP to access the archive at nonus.debian.org, under the debian-non-" @@ -9603,7 +9776,7 @@ msgstr "" "\"0\"/>" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:235 +#: sources.list.5.xml:251 msgid "&apt-cache; &apt-conf;" msgstr "&apt-cache; &apt-conf;" @@ -11120,6 +11293,13 @@ msgstr " # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade" msgid "Which will use the already fetched archives on the disc." msgstr "O qual irá usar os arquivos já obtidos e que estão no disco." +#~ msgid "" +#~ "Update the local keyring with the keyring of Debian archive keys and " +#~ "removes from the keyring the archive keys which are no longer valid." +#~ msgstr "" +#~ "Actualiza o chaveiro local com o chaveiro das chaves de arquivos Debian e " +#~ "remove do chaveiro as chaves de arquivo que já não são válidas." + #~ msgid "<option>--md5</option>" #~ msgstr "<option>--md5</option>" diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po index dd916eeba..93f189c9c 100644 --- a/doc/po/pt_BR.po +++ b/doc/po/pt_BR.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" -"POT-Creation-Date: 2011-06-28 16:42+0200\n" +"POT-Creation-Date: 2011-11-20 17:58+0100\n" "PO-Revision-Date: 2004-09-20 17:02+0000\n" "Last-Translator: André Luís Lopes <andrelop@debian.org>\n" "Language-Team: <debian-l10n-portuguese@lists.debian.org>\n" @@ -577,7 +577,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:64 apt-cdrom.8.xml:50 apt-config.8.xml:50 -#: apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:114 +#: apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:121 #: apt-key.8.xml:38 apt-mark.8.xml:56 apt-secure.8.xml:43 #: apt-sortpkgs.1.xml:47 apt.conf.5.xml:42 apt_preferences.5.xml:36 #: sources.list.5.xml:36 @@ -595,7 +595,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-cache.8.xml:70 apt-get.8.xml:120 +#: apt-cache.8.xml:70 apt-get.8.xml:127 msgid "" "Unless the <option>-h</option>, or <option>--help</option> option is given, " "one of the commands below must be present." @@ -963,8 +963,8 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:278 apt-config.8.xml:96 apt-extracttemplates.1.xml:59 -#: apt-ftparchive.1.xml:525 apt-get.8.xml:331 apt-mark.8.xml:126 -#: apt-sortpkgs.1.xml:57 apt.conf.5.xml:560 apt.conf.5.xml:582 +#: apt-ftparchive.1.xml:525 apt-get.8.xml:342 apt-mark.8.xml:126 +#: apt-sortpkgs.1.xml:57 apt.conf.5.xml:577 apt.conf.5.xml:599 msgid "options" msgstr "" @@ -987,7 +987,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:288 apt-ftparchive.1.xml:572 apt-get.8.xml:393 +#: apt-cache.8.xml:288 apt-ftparchive.1.xml:572 apt-get.8.xml:404 #: apt-sortpkgs.1.xml:61 msgid "<option>-s</option>" msgstr "" @@ -1008,12 +1008,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:383 +#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:394 msgid "<option>-q</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:383 +#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:394 msgid "<option>--quiet</option>" msgstr "" @@ -1095,7 +1095,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:323 apt-cdrom.8.xml:124 apt-get.8.xml:350 +#: apt-cache.8.xml:323 apt-cdrom.8.xml:124 apt-get.8.xml:361 msgid "<option>-f</option>" msgstr "" @@ -1113,6 +1113,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:584 +#: apt-get.8.xml:447 msgid "<option>-a</option>" msgstr "" @@ -1208,14 +1209,14 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist> #: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101 -#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:612 apt-get.8.xml:570 +#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:612 apt-get.8.xml:591 #: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67 msgid "&apt-commonoptions;" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:372 apt-get.8.xml:575 apt-key.8.xml:172 apt-mark.8.xml:144 -#: apt.conf.5.xml:1093 apt_preferences.5.xml:697 +#: apt-cache.8.xml:372 apt-get.8.xml:596 apt-key.8.xml:175 apt-mark.8.xml:144 +#: apt.conf.5.xml:1110 apt_preferences.5.xml:697 msgid "Files" msgstr "" @@ -1226,10 +1227,10 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106 -#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:628 apt-get.8.xml:585 -#: apt-key.8.xml:193 apt-mark.8.xml:150 apt-secure.8.xml:185 -#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:704 -#: sources.list.5.xml:234 +#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:628 apt-get.8.xml:606 +#: apt-key.8.xml:196 apt-mark.8.xml:150 apt-secure.8.xml:185 +#: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1116 apt_preferences.5.xml:704 +#: sources.list.5.xml:250 #, fuzzy msgid "See Also" msgstr "Consulte também" @@ -1241,7 +1242,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111 -#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:632 apt-get.8.xml:591 +#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:632 apt-get.8.xml:612 #: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76 msgid "Diagnostics" msgstr "" @@ -1341,12 +1342,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-cdrom.8.xml:94 apt-key.8.xml:158 +#: apt-cdrom.8.xml:94 apt-key.8.xml:161 msgid "Options" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:540 apt-get.8.xml:345 +#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:540 apt-get.8.xml:356 msgid "<option>-d</option>" msgstr "" @@ -1382,7 +1383,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cdrom.8.xml:116 apt-get.8.xml:364 +#: apt-cdrom.8.xml:116 apt-get.8.xml:375 msgid "<option>-m</option>" msgstr "" @@ -1427,17 +1428,17 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cdrom.8.xml:143 apt-get.8.xml:395 +#: apt-cdrom.8.xml:143 apt-get.8.xml:406 msgid "<option>--just-print</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cdrom.8.xml:144 apt-get.8.xml:397 +#: apt-cdrom.8.xml:144 apt-get.8.xml:408 msgid "<option>--recon</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cdrom.8.xml:145 apt-get.8.xml:398 +#: apt-cdrom.8.xml:145 apt-get.8.xml:409 msgid "<option>--no-act</option>" msgstr "" @@ -1616,7 +1617,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-extracttemplates.1.xml:63 apt-get.8.xml:504 +#: apt-extracttemplates.1.xml:63 apt-get.8.xml:525 msgid "<option>-t</option>" msgstr "" @@ -1817,7 +1818,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:145 apt-get.8.xml:287 +#: apt-ftparchive.1.xml:145 apt-get.8.xml:298 msgid "clean" msgstr "" @@ -2279,8 +2280,8 @@ msgid "" "free</literal>" msgstr "" -#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:394 +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:394 apt.conf.5.xml:157 msgid "Architectures" msgstr "" @@ -2611,8 +2612,8 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:617 apt.conf.5.xml:1087 apt_preferences.5.xml:544 -#: sources.list.5.xml:198 +#: apt-ftparchive.1.xml:617 apt.conf.5.xml:1104 apt_preferences.5.xml:544 +#: sources.list.5.xml:209 #, fuzzy msgid "Examples" msgstr "Exemplos" @@ -2662,10 +2663,11 @@ msgid "" "<option>-o= <replaceable>config_string</replaceable> </option> </arg> <arg> " "<option>-c= <replaceable>config_file</replaceable> </option> </arg> <arg> " "<option>-t=</option> <arg choice='plain'> <replaceable>target_release</" -"replaceable> </arg> </arg> <group choice=\"req\"> <arg " -"choice='plain'>update</arg> <arg choice='plain'>upgrade</arg> <arg " -"choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-upgrade</arg> " -"<arg choice='plain'>install <arg choice=\"plain\" rep=\"repeat" +"replaceable> </arg> </arg> <arg> <option>-a=</option> <arg choice='plain'> " +"<replaceable>default_architecture</replaceable> </arg> </arg> <group choice=" +"\"req\"> <arg choice='plain'>update</arg> <arg choice='plain'>upgrade</arg> " +"<arg choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-upgrade</" +"arg> <arg choice='plain'>install <arg choice=\"plain\" rep=\"repeat" "\"><replaceable>pkg</replaceable> <arg> <group choice='req'> <arg " "choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> <arg " "choice='plain'> /<replaceable>target_release</replaceable> </arg> </group> </" @@ -2687,7 +2689,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:115 +#: apt-get.8.xml:122 msgid "" "<command>apt-get</command> is the command-line tool for handling packages, " "and may be considered the user's \"back-end\" to other tools using the APT " @@ -2696,12 +2698,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:124 apt-key.8.xml:127 +#: apt-get.8.xml:131 apt-key.8.xml:127 msgid "update" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:125 +#: apt-get.8.xml:132 msgid "" "<literal>update</literal> is used to resynchronize the package index files " "from their sources. The indexes of available packages are fetched from the " @@ -2715,12 +2717,12 @@ msgid "" msgstr "" #. type: <tag></tag> -#: apt-get.8.xml:136 guide.sgml:121 +#: apt-get.8.xml:143 guide.sgml:121 msgid "upgrade" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:137 +#: apt-get.8.xml:144 msgid "" "<literal>upgrade</literal> is used to install the newest versions of all " "packages currently installed on the system from the sources enumerated in " @@ -2735,12 +2737,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:149 +#: apt-get.8.xml:156 msgid "dselect-upgrade" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:150 +#: apt-get.8.xml:157 msgid "" "<literal>dselect-upgrade</literal> is used in conjunction with the " "traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</" @@ -2751,12 +2753,12 @@ msgid "" msgstr "" #. type: <tag></tag> -#: apt-get.8.xml:159 guide.sgml:140 +#: apt-get.8.xml:166 guide.sgml:140 msgid "dist-upgrade" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:160 +#: apt-get.8.xml:167 msgid "" "<literal>dist-upgrade</literal> in addition to performing the function of " "<literal>upgrade</literal>, also intelligently handles changing dependencies " @@ -2770,12 +2772,12 @@ msgid "" msgstr "" #. type: <tag></tag> -#: apt-get.8.xml:172 guide.sgml:131 +#: apt-get.8.xml:179 guide.sgml:131 msgid "install" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:174 +#: apt-get.8.xml:181 msgid "" "<literal>install</literal> is followed by one or more packages desired for " "installation or upgrading. Each package is a package name, not a fully " @@ -2791,7 +2793,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:192 +#: apt-get.8.xml:199 msgid "" "A specific version of a package can be selected for installation by " "following the package name with an equals and the version of the package to " @@ -2802,14 +2804,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:199 +#: apt-get.8.xml:206 msgid "" "Both of the version selection mechanisms can downgrade packages and must be " "used with care." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:202 +#: apt-get.8.xml:209 msgid "" "This is also the target to use if you want to upgrade one or more already-" "installed packages without upgrading every package you have on your system. " @@ -2821,14 +2823,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:213 +#: apt-get.8.xml:220 msgid "" "Finally, the &apt-preferences; mechanism allows you to create an alternative " "installation policy for individual packages." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:217 +#: apt-get.8.xml:224 msgid "" "If no package matches the given expression and the expression contains one " "of '.', '?' or '*' then it is assumed to be a POSIX regular expression, and " @@ -2840,12 +2842,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:226 +#: apt-get.8.xml:233 msgid "remove" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:227 +#: apt-get.8.xml:234 msgid "" "<literal>remove</literal> is identical to <literal>install</literal> except " "that packages are removed instead of installed. Note the removing a package " @@ -2855,12 +2857,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:234 +#: apt-get.8.xml:241 msgid "purge" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:235 +#: apt-get.8.xml:242 msgid "" "<literal>purge</literal> is identical to <literal>remove</literal> except " "that packages are removed and purged (any configuration files are deleted " @@ -2868,12 +2870,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:239 +#: apt-get.8.xml:246 msgid "source" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:240 +#: apt-get.8.xml:247 msgid "" "<literal>source</literal> causes <command>apt-get</command> to fetch source " "packages. APT will examine the available packages to decide which source " @@ -2885,7 +2887,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:248 +#: apt-get.8.xml:255 msgid "" "Source packages are tracked separately from binary packages via <literal>deb-" "src</literal> type lines in the &sources-list; file. This means that you " @@ -2895,16 +2897,17 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:255 +#: apt-get.8.xml:262 msgid "" "If the <option>--compile</option> option is specified then the package will " -"be compiled to a binary .deb using <command>dpkg-buildpackage</command>, if " -"<option>--download-only</option> is specified then the source package will " -"not be unpacked." +"be compiled to a binary .deb using <command>dpkg-buildpackage</command> for " +"the architecture as defined by the <command>--host-architecture</command> " +"option. If <option>--download-only</option> is specified then the source " +"package will not be unpacked." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:260 +#: apt-get.8.xml:269 msgid "" "A specific source version can be retrieved by postfixing the source name " "with an equals and then the version to fetch, similar to the mechanism used " @@ -2914,7 +2917,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:266 +#: apt-get.8.xml:275 msgid "" "Note that source packages are not tracked like binary packages, they exist " "only in the current directory and are similar to downloading source tar " @@ -2922,43 +2925,46 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:271 +#: apt-get.8.xml:280 msgid "build-dep" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:272 +#: apt-get.8.xml:281 msgid "" "<literal>build-dep</literal> causes apt-get to install/remove packages in an " -"attempt to satisfy the build dependencies for a source package." +"attempt to satisfy the build dependencies for a source package. By default " +"the dependencies are satisfied to build the package natively. If desired a " +"host-architecture can be specified with the <option>--host-architecture</" +"option> option instead." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:276 +#: apt-get.8.xml:287 msgid "check" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:277 +#: apt-get.8.xml:288 msgid "" "<literal>check</literal> is a diagnostic tool; it updates the package cache " "and checks for broken dependencies." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:281 +#: apt-get.8.xml:292 msgid "download" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:282 +#: apt-get.8.xml:293 msgid "" "<literal>download</literal> will download the given binary package into the " "current directory." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:288 +#: apt-get.8.xml:299 msgid "" "<literal>clean</literal> clears out the local repository of retrieved " "package files. It removes everything but the lock file from " @@ -2970,12 +2976,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:297 +#: apt-get.8.xml:308 msgid "autoclean" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:298 +#: apt-get.8.xml:309 msgid "" "Like <literal>clean</literal>, <literal>autoclean</literal> clears out the " "local repository of retrieved package files. The difference is that it only " @@ -2987,25 +2993,25 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:307 +#: apt-get.8.xml:318 msgid "autoremove" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:308 +#: apt-get.8.xml:319 msgid "" "<literal>autoremove</literal> is used to remove packages that were " -"automatically installed to satisfy dependencies for some package and that " -"are no more needed." +"automatically installed to satisfy dependencies for other packages and are " +"now no longer needed." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:312 +#: apt-get.8.xml:323 msgid "changelog" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:313 +#: apt-get.8.xml:324 msgid "" "<literal>changelog</literal> downloads a package changelog and displays it " "through <command>sensible-pager</command>. The server name and base " @@ -3018,48 +3024,48 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:335 +#: apt-get.8.xml:346 msgid "<option>--no-install-recommends</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:336 +#: apt-get.8.xml:347 msgid "" "Do not consider recommended packages as a dependency for installing. " "Configuration Item: <literal>APT::Install-Recommends</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:340 +#: apt-get.8.xml:351 msgid "<option>--install-suggests</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:341 +#: apt-get.8.xml:352 msgid "" "Consider suggested packages as a dependency for installing. Configuration " "Item: <literal>APT::Install-Suggests</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:345 +#: apt-get.8.xml:356 msgid "<option>--download-only</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:346 +#: apt-get.8.xml:357 msgid "" "Download only; package files are only retrieved, not unpacked or installed. " "Configuration Item: <literal>APT::Get::Download-Only</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:350 +#: apt-get.8.xml:361 msgid "<option>--fix-broken</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:351 +#: apt-get.8.xml:362 msgid "" "Fix; attempt to correct a system with broken dependencies in place. This " "option, when used with install/remove, can omit any packages to permit APT " @@ -3075,17 +3081,17 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:364 +#: apt-get.8.xml:375 msgid "<option>--ignore-missing</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:365 +#: apt-get.8.xml:376 msgid "<option>--fix-missing</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:366 +#: apt-get.8.xml:377 msgid "" "Ignore missing packages; If packages cannot be retrieved or fail the " "integrity check after retrieval (corrupted package files), hold back those " @@ -3097,12 +3103,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:376 +#: apt-get.8.xml:387 msgid "<option>--no-download</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:377 +#: apt-get.8.xml:388 msgid "" "Disables downloading of packages. This is best used with <option>--ignore-" "missing</option> to force APT to use only the .debs it has already " @@ -3110,7 +3116,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:384 +#: apt-get.8.xml:395 msgid "" "Quiet; produces output suitable for logging, omitting progress indicators. " "More q's will produce more quiet up to a maximum of 2. You can also use " @@ -3122,17 +3128,17 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:394 +#: apt-get.8.xml:405 msgid "<option>--simulate</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:396 +#: apt-get.8.xml:407 msgid "<option>--dry-run</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:399 +#: apt-get.8.xml:410 msgid "" "No action; perform a simulation of events that would occur but do not " "actually change the system. Configuration Item: <literal>APT::Get::" @@ -3140,7 +3146,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:403 +#: apt-get.8.xml:414 msgid "" "Simulation run as user will deactivate locking (<literal>Debug::NoLocking</" "literal>) automatic. Also a notice will be displayed indicating that this " @@ -3151,7 +3157,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:409 +#: apt-get.8.xml:420 msgid "" "Simulate prints out a series of lines each one representing a dpkg " "operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square brackets " @@ -3160,22 +3166,22 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:416 +#: apt-get.8.xml:427 msgid "<option>-y</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:416 +#: apt-get.8.xml:427 msgid "<option>--yes</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:417 +#: apt-get.8.xml:428 msgid "<option>--assume-yes</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:418 +#: apt-get.8.xml:429 msgid "" "Automatic yes to prompts; assume \"yes\" as answer to all prompts and run " "non-interactively. If an undesirable situation, such as changing a held " @@ -3185,68 +3191,84 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:425 +#: apt-get.8.xml:436 msgid "<option>-u</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:425 +#: apt-get.8.xml:436 msgid "<option>--show-upgraded</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:426 +#: apt-get.8.xml:437 msgid "" "Show upgraded packages; Print out a list of all packages that are to be " "upgraded. Configuration Item: <literal>APT::Get::Show-Upgraded</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:431 +#: apt-get.8.xml:442 msgid "<option>-V</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:431 +#: apt-get.8.xml:442 msgid "<option>--verbose-versions</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:432 +#: apt-get.8.xml:443 msgid "" "Show full versions for upgraded and installed packages. Configuration Item: " "<literal>APT::Get::Show-Versions</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:436 +#: apt-get.8.xml:448 +msgid "<option>--host-architecture</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:449 +msgid "" +"This option controls the architecture packages are built for by <command>apt-" +"get source --compile</command> and how cross-builddependencies are " +"satisfied. By default is it not set which means that the host architecture " +"is the same as the build architecture (which is defined by <literal>APT::" +"Architecture</literal>). Configuration Item: <literal>APT::Get::Host-" +"Architecture</literal>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:457 msgid "<option>-b</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:436 +#: apt-get.8.xml:457 msgid "<option>--compile</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:437 +#: apt-get.8.xml:458 msgid "<option>--build</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:438 +#: apt-get.8.xml:459 msgid "" "Compile source packages after downloading them. Configuration Item: " "<literal>APT::Get::Compile</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:442 +#: apt-get.8.xml:463 msgid "<option>--ignore-hold</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:443 +#: apt-get.8.xml:464 msgid "" "Ignore package Holds; This causes <command>apt-get</command> to ignore a " "hold placed on a package. This may be useful in conjunction with " @@ -3255,12 +3277,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:449 +#: apt-get.8.xml:470 msgid "<option>--no-upgrade</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:450 +#: apt-get.8.xml:471 msgid "" "Do not upgrade packages; When used in conjunction with <literal>install</" "literal>, <literal>no-upgrade</literal> will prevent packages on the command " @@ -3269,12 +3291,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:456 +#: apt-get.8.xml:477 msgid "<option>--only-upgrade</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:457 +#: apt-get.8.xml:478 msgid "" "Do not install new packages; When used in conjunction with <literal>install</" "literal>, <literal>only-upgrade</literal> will prevent packages on the " @@ -3283,12 +3305,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:463 +#: apt-get.8.xml:484 msgid "<option>--force-yes</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:464 +#: apt-get.8.xml:485 msgid "" "Force yes; This is a dangerous option that will cause apt to continue " "without prompting if it is doing something potentially harmful. It should " @@ -3298,12 +3320,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:471 +#: apt-get.8.xml:492 msgid "<option>--print-uris</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:472 +#: apt-get.8.xml:493 msgid "" "Instead of fetching the files to install their URIs are printed. Each URI " "will have the path, the destination file name, the size and the expected md5 " @@ -3316,12 +3338,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:482 +#: apt-get.8.xml:503 msgid "<option>--purge</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:483 +#: apt-get.8.xml:504 msgid "" "Use purge instead of remove for anything that would be removed. An asterisk " "(\"*\") will be displayed next to packages which are scheduled to be purged. " @@ -3330,24 +3352,24 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:490 +#: apt-get.8.xml:511 msgid "<option>--reinstall</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:491 +#: apt-get.8.xml:512 msgid "" "Re-Install packages that are already installed and at the newest version. " "Configuration Item: <literal>APT::Get::ReInstall</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:495 +#: apt-get.8.xml:516 msgid "<option>--list-cleanup</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:496 +#: apt-get.8.xml:517 msgid "" "This option defaults to on, use <literal>--no-list-cleanup</literal> to turn " "it off. When on <command>apt-get</command> will automatically manage the " @@ -3358,17 +3380,17 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:505 +#: apt-get.8.xml:526 msgid "<option>--target-release</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:506 +#: apt-get.8.xml:527 msgid "<option>--default-release</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:507 +#: apt-get.8.xml:528 msgid "" "This option controls the default input to the policy engine, it creates a " "default pin at priority 990 using the specified release string. This " @@ -3382,12 +3404,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:520 +#: apt-get.8.xml:541 msgid "<option>--trivial-only</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:522 +#: apt-get.8.xml:543 msgid "" "Only perform operations that are 'trivial'. Logically this can be considered " "related to <option>--assume-yes</option>, where <option>--assume-yes</" @@ -3396,24 +3418,24 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:528 +#: apt-get.8.xml:549 msgid "<option>--no-remove</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:529 +#: apt-get.8.xml:550 msgid "" "If any packages are to be removed apt-get immediately aborts without " "prompting. Configuration Item: <literal>APT::Get::Remove</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:534 +#: apt-get.8.xml:555 msgid "<option>--auto-remove</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:535 +#: apt-get.8.xml:556 msgid "" "If the command is either <literal>install</literal> or <literal>remove</" "literal>, then this option acts like running <literal>autoremove</literal> " @@ -3422,12 +3444,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:541 +#: apt-get.8.xml:562 msgid "<option>--only-source</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:542 +#: apt-get.8.xml:563 msgid "" "Only has meaning for the <literal>source</literal> and <literal>build-dep</" "literal> commands. Indicates that the given source names are not to be " @@ -3439,22 +3461,22 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:552 +#: apt-get.8.xml:573 msgid "<option>--diff-only</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:552 +#: apt-get.8.xml:573 msgid "<option>--dsc-only</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:552 +#: apt-get.8.xml:573 msgid "<option>--tar-only</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:553 +#: apt-get.8.xml:574 msgid "" "Download only the diff, dsc, or tar file of a source archive. Configuration " "Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</" @@ -3462,24 +3484,24 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:558 +#: apt-get.8.xml:579 msgid "<option>--arch-only</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:559 +#: apt-get.8.xml:580 msgid "" "Only process architecture-dependent build-dependencies. Configuration Item: " "<literal>APT::Get::Arch-Only</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:563 +#: apt-get.8.xml:584 msgid "<option>--allow-unauthenticated</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:564 +#: apt-get.8.xml:585 msgid "" "Ignore if packages can't be authenticated and don't prompt about it. This " "is useful for tools like pbuilder. Configuration Item: <literal>APT::Get::" @@ -3487,14 +3509,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist> -#: apt-get.8.xml:577 +#: apt-get.8.xml:598 msgid "" "&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; " "&file-statelists;" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:586 +#: apt-get.8.xml:607 msgid "" "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, " "&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-" @@ -3502,29 +3524,29 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:592 +#: apt-get.8.xml:613 msgid "" "<command>apt-get</command> returns zero on normal operation, decimal 100 on " "error." msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:595 +#: apt-get.8.xml:616 msgid "ORIGINAL AUTHORS" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:596 +#: apt-get.8.xml:617 msgid "&apt-author.jgunthorpe;" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:599 +#: apt-get.8.xml:620 msgid "CURRENT AUTHORS" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:601 +#: apt-get.8.xml:622 msgid "&apt-author.team;" msgstr "" @@ -3638,33 +3660,38 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:131 msgid "" -"Update the local keyring with the keyring of Debian archive keys and removes " -"from the keyring the archive keys which are no longer valid." +"Update the local keyring with the archive keyring and remove from the local " +"keyring the archive keys which are no longer valid. The archive keyring is " +"shipped in the <literal>archive-keyring</literal> package of your " +"distribution, e.g. the <literal>debian-archive-keyring</literal> package in " +"Debian." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:140 +#: apt-key.8.xml:141 msgid "net-update" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:144 +#: apt-key.8.xml:145 msgid "" -"Update the local keyring with the keys of a key server and removes from the " -"keyring the archive keys which are no longer valid. This requires an " -"installed wget and an APT build configured to have a server to fetch from. " -"APT in Debian does not support this command, but Ubuntu's APT does." +"Work similar to the <command>update</command> command above, but get the " +"archive keyring from an URI instead and validate it against a master key. " +"This requires an installed &wget; and an APT build configured to have a " +"server to fetch from and a master keyring to validate. APT in Debian does " +"not support this command and relies on <command>update</command> instead, " +"but Ubuntu's APT does." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-key.8.xml:159 +#: apt-key.8.xml:162 msgid "" "Note that options need to be defined before the commands described in the " "previous section." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:161 +#: apt-key.8.xml:164 #, fuzzy msgid "--keyring <replaceable>filename</replaceable>" msgstr "" @@ -3672,55 +3699,55 @@ msgstr "" "apt-get install <replaceable>pacote</replaceable>/testing\n" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:162 +#: apt-key.8.xml:165 msgid "" "With this option it is possible to specify a specific keyring file the " "command should operate on. The default is that a command is executed on the " "<filename>trusted.gpg</filename> file as well as on all parts in the " -"<filename>trusted.gpg.d</filename> directory, through <filename>trusted.gpg</" +"<filename>trusted.gpg.d</filename> directory, though <filename>trusted.gpg</" "filename> is the primary keyring which means that e.g. new keys are added to " "this one." msgstr "" #. type: Content of: <refentry><refsect1><variablelist> -#: apt-key.8.xml:175 +#: apt-key.8.xml:178 msgid "&file-trustedgpg;" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:177 +#: apt-key.8.xml:180 #, fuzzy msgid "<filename>/etc/apt/trustdb.gpg</filename>" msgstr "<filename>/etc/apt.conf</>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:178 +#: apt-key.8.xml:181 msgid "Local trust database of archive keys." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:181 +#: apt-key.8.xml:184 msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:182 +#: apt-key.8.xml:185 msgid "Keyring of Debian archive trusted keys." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-key.8.xml:185 +#: apt-key.8.xml:188 msgid "" "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-key.8.xml:186 +#: apt-key.8.xml:189 msgid "Keyring of Debian archive removed trusted keys." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-key.8.xml:195 +#: apt-key.8.xml:198 #, fuzzy msgid "&apt-get;, &apt-secure;" msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;" @@ -4412,13 +4439,24 @@ msgid "" "compiled for." msgstr "" +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:158 +msgid "" +"All Architectures the system supports. Processors implementing the " +"<literal>amd64</literal> are e.g. also able to execute binaries compiled for " +"<literal>i386</literal>; This list is use when fetching files and parsing " +"package lists. The internal default is always the native architecture " +"(<literal>APT::Architecture</literal>) and all foreign architectures it can " +"retrieve by calling <command>dpkg --print-foreign-architectures</command>." +msgstr "" + #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:157 +#: apt.conf.5.xml:165 msgid "Default-Release" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:158 +#: apt.conf.5.xml:166 msgid "" "Default release to install packages from if more than one version available. " "Contains release name, codename or release version. Examples: 'stable', " @@ -4427,24 +4465,24 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:163 +#: apt.conf.5.xml:171 msgid "Ignore-Hold" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:164 +#: apt.conf.5.xml:172 msgid "" "Ignore Held packages; This global option causes the problem resolver to " "ignore held packages in its decision making." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:168 +#: apt.conf.5.xml:176 msgid "Clean-Installed" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:169 +#: apt.conf.5.xml:177 msgid "" "Defaults to on. When turned on the autoclean feature will remove any " "packages which can no longer be downloaded from the cache. If turned off " @@ -4453,12 +4491,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:175 +#: apt.conf.5.xml:183 msgid "Immediate-Configure" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:176 +#: apt.conf.5.xml:184 msgid "" "Defaults to on which will cause APT to install essential and important " "packages as fast as possible in the install/upgrade operation. This is done " @@ -4491,12 +4529,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:198 +#: apt.conf.5.xml:206 msgid "Force-LoopBreak" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:199 +#: apt.conf.5.xml:207 msgid "" "Never Enable this option unless you -really- know what you are doing. It " "permits APT to temporarily remove an essential package to break a Conflicts/" @@ -4507,12 +4545,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:207 +#: apt.conf.5.xml:215 msgid "Cache-Start, Cache-Grow and Cache-Limit" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:208 +#: apt.conf.5.xml:216 msgid "" "APT uses since version 0.7.26 a resizable memory mapped cache file to store " "the 'available' information. <literal>Cache-Start</literal> acts as a hint " @@ -4532,63 +4570,63 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:223 +#: apt.conf.5.xml:231 msgid "Build-Essential" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:224 +#: apt.conf.5.xml:232 msgid "Defines which package(s) are considered essential build dependencies." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:227 +#: apt.conf.5.xml:235 msgid "Get" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:228 +#: apt.conf.5.xml:236 msgid "" "The Get subsection controls the &apt-get; tool, please see its documentation " "for more information about the options here." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:232 +#: apt.conf.5.xml:240 msgid "Cache" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:233 +#: apt.conf.5.xml:241 msgid "" "The Cache subsection controls the &apt-cache; tool, please see its " "documentation for more information about the options here." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:237 +#: apt.conf.5.xml:245 msgid "CDROM" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:238 +#: apt.conf.5.xml:246 msgid "" "The CDROM subsection controls the &apt-cdrom; tool, please see its " "documentation for more information about the options here." msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:244 +#: apt.conf.5.xml:252 msgid "The Acquire Group" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:249 +#: apt.conf.5.xml:257 msgid "Check-Valid-Until" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:250 +#: apt.conf.5.xml:258 msgid "" "Security related option defaulting to true as an expiring validation for a " "Release file prevents longtime replay attacks and can e.g. also help users " @@ -4600,38 +4638,51 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:260 +#: apt.conf.5.xml:268 msgid "Max-ValidTime" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:261 +#: apt.conf.5.xml:269 +msgid "" +"Seconds the Release file should be considered valid after it was created " +"(indicated by the <literal>Date</literal> header). If the Release file " +"itself includes a <literal>Valid-Until</literal> header the earlier date of " +"the two is used as the expiration date. The default value is <literal>0</" +"literal> which stands for \"for ever\". Archive specific settings can be " +"made by appending the label of the archive to the option name." +msgstr "" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: apt.conf.5.xml:279 +msgid "Min-ValidTime" +msgstr "" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:280 msgid "" -"Seconds the Release file should be considered valid after it was created. " -"The default is \"for ever\" (0) if the Release file of the archive doesn't " -"include a <literal>Valid-Until</literal> header. If it does then this date " -"is the default. The date from the Release file or the date specified by the " -"creation time of the Release file (<literal>Date</literal> header) plus the " -"seconds specified with this options are used to check if the validation of a " -"file has expired by using the earlier date of the two. Archive specific " -"settings can be made by appending the label of the archive to the option " -"name." +"Minimum of seconds the Release file should be considered valid after it was " +"created (indicated by the <literal>Date</literal> header). Use this if you " +"need to use a seldomly updated (local) mirror of a more regular updated " +"archive with a <literal>Valid-Until</literal> header instead of completely " +"disabling the expiration date checking. Archive specific settings can and " +"should be used by appending the label of the archive to the option name." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:273 +#: apt.conf.5.xml:290 msgid "PDiffs" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:274 +#: apt.conf.5.xml:291 msgid "" "Try to download deltas called <literal>PDiffs</literal> for Packages or " "Sources files instead of downloading whole ones. True by default." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:277 +#: apt.conf.5.xml:294 msgid "" "Two sub-options to limit the use of PDiffs are also available: With " "<literal>FileLimit</literal> can be specified how many PDiff files are " @@ -4642,12 +4693,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:286 +#: apt.conf.5.xml:303 msgid "Queue-Mode" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:287 +#: apt.conf.5.xml:304 msgid "" "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</" "literal> or <literal>access</literal> which determines how APT parallelizes " @@ -4657,36 +4708,36 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:294 +#: apt.conf.5.xml:311 msgid "Retries" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:295 +#: apt.conf.5.xml:312 msgid "" "Number of retries to perform. If this is non-zero APT will retry failed " "files the given number of times." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:299 +#: apt.conf.5.xml:316 msgid "Source-Symlinks" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:300 +#: apt.conf.5.xml:317 msgid "" "Use symlinks for source archives. If set to true then source archives will " "be symlinked when possible instead of copying. True is the default." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:304 sources.list.5.xml:144 +#: apt.conf.5.xml:321 sources.list.5.xml:155 msgid "http" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:305 +#: apt.conf.5.xml:322 msgid "" "HTTP URIs; http::Proxy is the default http proxy to use. It is in the " "standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per " @@ -4697,7 +4748,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:313 +#: apt.conf.5.xml:330 msgid "" "Three settings are provided for cache control with HTTP/1.1 compliant proxy " "caches. <literal>No-Cache</literal> tells the proxy to not use its cached " @@ -4711,7 +4762,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:323 apt.conf.5.xml:387 +#: apt.conf.5.xml:340 apt.conf.5.xml:404 msgid "" "The option <literal>timeout</literal> sets the timeout timer used by the " "method, this applies to all things including connection timeout and data " @@ -4719,7 +4770,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:326 +#: apt.conf.5.xml:343 msgid "" "One setting is provided to control the pipeline depth in cases where the " "remote server is not RFC conforming or buggy (such as Squid 2.0.2). " @@ -4731,7 +4782,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:334 +#: apt.conf.5.xml:351 msgid "" "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</" "literal> which accepts integer values in kilobyte. The default value is 0 " @@ -4741,7 +4792,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:339 +#: apt.conf.5.xml:356 msgid "" "<literal>Acquire::http::User-Agent</literal> can be used to set a different " "User-Agent for the http download method as some proxies allow access for " @@ -4749,12 +4800,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:345 +#: apt.conf.5.xml:362 msgid "https" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:346 +#: apt.conf.5.xml:363 msgid "" "HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy " "options are the same as for <literal>http</literal> method and will also " @@ -4764,7 +4815,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:352 +#: apt.conf.5.xml:369 msgid "" "<literal>CaInfo</literal> suboption specifies place of file that holds info " "about trusted certificates. <literal><host>::CaInfo</literal> is " @@ -4785,12 +4836,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:370 sources.list.5.xml:155 +#: apt.conf.5.xml:387 sources.list.5.xml:166 msgid "ftp" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:371 +#: apt.conf.5.xml:388 msgid "" "FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard " "form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host " @@ -4809,7 +4860,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:390 +#: apt.conf.5.xml:407 msgid "" "Several settings are provided to control passive mode. Generally it is safe " "to leave passive mode on, it works in nearly every environment. However " @@ -4819,7 +4870,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:397 +#: apt.conf.5.xml:414 msgid "" "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</" "envar> environment variable to a http url - see the discussion of the http " @@ -4828,7 +4879,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:402 +#: apt.conf.5.xml:419 msgid "" "The setting <literal>ForceExtended</literal> controls the use of RFC2428 " "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is " @@ -4838,18 +4889,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:409 sources.list.5.xml:137 +#: apt.conf.5.xml:426 sources.list.5.xml:148 msgid "cdrom" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:415 +#: apt.conf.5.xml:432 #, no-wrap msgid "/cdrom/::Mount \"foo\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:410 +#: apt.conf.5.xml:427 msgid "" "CDROM URIs; the only setting for CDROM URIs is the mount point, " "<literal>cdrom::Mount</literal> which must be the mount point for the CDROM " @@ -4862,12 +4913,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:420 +#: apt.conf.5.xml:437 msgid "gpgv" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:421 +#: apt.conf.5.xml:438 msgid "" "GPGV URIs; the only option for GPGV URIs is the option to pass additional " "parameters to gpgv. <literal>gpgv::Options</literal> Additional options " @@ -4875,18 +4926,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:426 +#: apt.conf.5.xml:443 msgid "CompressionTypes" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:432 +#: apt.conf.5.xml:449 #, no-wrap msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:427 +#: apt.conf.5.xml:444 msgid "" "List of compression types which are understood by the acquire methods. " "Files like <filename>Packages</filename> can be available in various " @@ -4898,19 +4949,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:437 +#: apt.conf.5.xml:454 #, no-wrap msgid "Acquire::CompressionTypes::Order:: \"gz\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:440 +#: apt.conf.5.xml:457 #, no-wrap msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:433 +#: apt.conf.5.xml:450 msgid "" "Also the <literal>Order</literal> subgroup can be used to define in which " "order the acquire system will try to download the compressed files. The " @@ -4927,13 +4978,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:444 +#: apt.conf.5.xml:461 #, no-wrap msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:442 +#: apt.conf.5.xml:459 msgid "" "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</" "replaceable></literal> will be checked: If this setting exists the method " @@ -4948,7 +4999,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:449 +#: apt.conf.5.xml:466 msgid "" "The special type <literal>uncompressed</literal> can be used to give " "uncompressed files a preference, but note that most archives don't provide " @@ -4956,12 +5007,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:454 +#: apt.conf.5.xml:471 msgid "GzipIndexes" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:456 +#: apt.conf.5.xml:473 msgid "" "When downloading <literal>gzip</literal> compressed indexes (Packages, " "Sources, or Translations), keep them gzip compressed locally instead of " @@ -4970,12 +5021,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:463 +#: apt.conf.5.xml:480 msgid "Languages" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:464 +#: apt.conf.5.xml:481 msgid "" "The Languages subsection controls which <filename>Translation</filename> " "files are downloaded and in which order APT tries to display the Description-" @@ -4988,13 +5039,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting> -#: apt.conf.5.xml:480 +#: apt.conf.5.xml:497 #, no-wrap msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:470 +#: apt.conf.5.xml:487 msgid "" "The default list includes \"environment\" and \"en\". " "\"<literal>environment</literal>\" has a special meaning here: It will be " @@ -5017,19 +5068,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:245 +#: apt.conf.5.xml:253 msgid "" "The <literal>Acquire</literal> group of options controls the download of " "packages and the URI handlers. <placeholder type=\"variablelist\" id=\"0\"/>" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:487 +#: apt.conf.5.xml:504 msgid "Directories" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:489 +#: apt.conf.5.xml:506 msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " "local state information. <literal>lists</literal> is the directory to place " @@ -5041,7 +5092,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:496 +#: apt.conf.5.xml:513 msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " "information, such as the two package caches <literal>srcpkgcache</literal> " @@ -5054,7 +5105,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:505 +#: apt.conf.5.xml:522 msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " "<literal>sourcelist</literal> gives the location of the sourcelist and " @@ -5064,7 +5115,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:511 +#: apt.conf.5.xml:528 msgid "" "The <literal>Dir::Parts</literal> setting reads in all the config fragments " "in lexical order from the directory specified. After this is done then the " @@ -5072,7 +5123,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:515 +#: apt.conf.5.xml:532 msgid "" "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::" "Bin::Methods</literal> specifies the location of the method handlers and " @@ -5083,7 +5134,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:523 +#: apt.conf.5.xml:540 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@ -5096,7 +5147,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:536 +#: apt.conf.5.xml:553 msgid "" "The <literal>Ignore-Files-Silently</literal> list can be used to specify " "which files APT should silently ignore while parsing the files in the " @@ -5107,12 +5158,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:545 +#: apt.conf.5.xml:562 msgid "APT in DSelect" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:547 +#: apt.conf.5.xml:564 msgid "" "When APT is used as a &dselect; method several configuration directives " "control the default behaviour. These are in the <literal>DSelect</literal> " @@ -5120,12 +5171,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:551 +#: apt.conf.5.xml:568 msgid "Clean" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:552 +#: apt.conf.5.xml:569 msgid "" "Cache Clean mode; this value may be one of always, prompt, auto, pre-auto " "and never. always and prompt will remove all packages from the cache after " @@ -5136,50 +5187,50 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:561 +#: apt.conf.5.xml:578 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the install phase." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:565 +#: apt.conf.5.xml:582 msgid "Updateoptions" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:566 +#: apt.conf.5.xml:583 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the update phase." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:570 +#: apt.conf.5.xml:587 msgid "PromptAfterUpdate" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:571 +#: apt.conf.5.xml:588 msgid "" "If true the [U]pdate operation in &dselect; will always prompt to continue. " "The default is to prompt only on error." msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:577 +#: apt.conf.5.xml:594 msgid "How APT calls dpkg" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:578 +#: apt.conf.5.xml:595 msgid "" "Several configuration directives control how APT invokes &dpkg;. These are " "in the <literal>DPkg</literal> section." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:583 +#: apt.conf.5.xml:600 msgid "" "This is a list of options to pass to dpkg. The options must be specified " "using the list notation and each list item is passed as a single argument to " @@ -5187,17 +5238,17 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:588 +#: apt.conf.5.xml:605 msgid "Pre-Invoke" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:588 +#: apt.conf.5.xml:605 msgid "Post-Invoke" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:589 +#: apt.conf.5.xml:606 msgid "" "This is a list of shell commands to run before/after invoking &dpkg;. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -5206,12 +5257,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:595 +#: apt.conf.5.xml:612 msgid "Pre-Install-Pkgs" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:596 +#: apt.conf.5.xml:613 msgid "" "This is a list of shell commands to run before invoking dpkg. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -5221,7 +5272,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:602 +#: apt.conf.5.xml:619 msgid "" "Version 2 of this protocol dumps more information, including the protocol " "version, the APT configuration space and the packages, files and versions " @@ -5231,36 +5282,36 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:609 +#: apt.conf.5.xml:626 msgid "Run-Directory" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:610 +#: apt.conf.5.xml:627 msgid "" "APT chdirs to this directory before invoking dpkg, the default is <filename>/" "</filename>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:614 +#: apt.conf.5.xml:631 msgid "Build-options" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:615 +#: apt.conf.5.xml:632 msgid "" "These options are passed to &dpkg-buildpackage; when compiling packages, the " "default is to disable signing and produce all binaries." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt.conf.5.xml:620 +#: apt.conf.5.xml:637 msgid "dpkg trigger usage (and related options)" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:621 +#: apt.conf.5.xml:638 msgid "" "APT can call dpkg in a way so it can make aggressive use of triggers over " "multiple calls of dpkg. Without further options dpkg will use triggers only " @@ -5275,7 +5326,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> -#: apt.conf.5.xml:636 +#: apt.conf.5.xml:653 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@ -5285,7 +5336,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:630 +#: apt.conf.5.xml:647 msgid "" "Note that it is not guaranteed that APT will support these options or that " "these options will not cause (big) trouble in the future. If you have " @@ -5299,12 +5350,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:642 +#: apt.conf.5.xml:659 msgid "DPkg::NoTriggers" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:643 +#: apt.conf.5.xml:660 msgid "" "Add the no triggers flag to all dpkg calls (except the ConfigurePending " "call). See &dpkg; if you are interested in what this actually means. In " @@ -5316,12 +5367,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:650 +#: apt.conf.5.xml:667 msgid "PackageManager::Configure" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:651 +#: apt.conf.5.xml:668 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default " @@ -5337,12 +5388,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:661 +#: apt.conf.5.xml:678 msgid "DPkg::ConfigurePending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:662 +#: apt.conf.5.xml:679 msgid "" "If this option is set apt will call <command>dpkg --configure --pending</" "command> to let dpkg handle all required configurations and triggers. This " @@ -5353,12 +5404,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:668 +#: apt.conf.5.xml:685 msgid "DPkg::TriggersPending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:669 +#: apt.conf.5.xml:686 msgid "" "Useful for <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal> and dpkg " @@ -5368,12 +5419,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:674 +#: apt.conf.5.xml:691 msgid "PackageManager::UnpackAll" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:675 +#: apt.conf.5.xml:692 msgid "" "As the configuration can be deferred to be done at the end by dpkg it can be " "tried to order the unpack series only by critical needs, e.g. by Pre-" @@ -5385,12 +5436,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:682 +#: apt.conf.5.xml:699 msgid "OrderList::Score::Immediate" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:690 +#: apt.conf.5.xml:707 #, no-wrap msgid "" "OrderList::Score {\n" @@ -5402,7 +5453,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:683 +#: apt.conf.5.xml:700 msgid "" "Essential packages (and there dependencies) should be configured immediately " "after unpacking. It will be a good idea to do this quite early in the " @@ -5416,12 +5467,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:703 +#: apt.conf.5.xml:720 msgid "Periodic and Archives options" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:704 +#: apt.conf.5.xml:721 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by " @@ -5430,12 +5481,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:712 +#: apt.conf.5.xml:729 msgid "Debug options" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:714 +#: apt.conf.5.xml:731 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@ -5446,7 +5497,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:725 +#: apt.conf.5.xml:742 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</" @@ -5454,7 +5505,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:733 +#: apt.conf.5.xml:750 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s install</" @@ -5462,7 +5513,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:742 +#: apt.conf.5.xml:759 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@ -5472,120 +5523,120 @@ msgstr "" #. motivating example, except I haven't a clue why you'd want #. to do this. #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:750 +#: apt.conf.5.xml:767 msgid "" "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " "in CDROM IDs." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:760 +#: apt.conf.5.xml:777 msgid "A full list of debugging options to apt follows." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:765 +#: apt.conf.5.xml:782 #, fuzzy msgid "<literal>Debug::Acquire::cdrom</literal>" msgstr "a linha <literal>Archive:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:769 +#: apt.conf.5.xml:786 msgid "" "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:776 +#: apt.conf.5.xml:793 #, fuzzy msgid "<literal>Debug::Acquire::ftp</literal>" msgstr "a linha <literal>Archive:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:780 +#: apt.conf.5.xml:797 msgid "Print information related to downloading packages using FTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:787 +#: apt.conf.5.xml:804 #, fuzzy msgid "<literal>Debug::Acquire::http</literal>" msgstr "a linha <literal>Archive:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:791 +#: apt.conf.5.xml:808 msgid "Print information related to downloading packages using HTTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:798 +#: apt.conf.5.xml:815 #, fuzzy msgid "<literal>Debug::Acquire::https</literal>" msgstr "a linha <literal>Archive:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:802 +#: apt.conf.5.xml:819 msgid "Print information related to downloading packages using HTTPS." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:809 +#: apt.conf.5.xml:826 #, fuzzy msgid "<literal>Debug::Acquire::gpgv</literal>" msgstr "a linha <literal>Archive:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:813 +#: apt.conf.5.xml:830 msgid "" "Print information related to verifying cryptographic signatures using " "<literal>gpg</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:820 +#: apt.conf.5.xml:837 #, fuzzy msgid "<literal>Debug::aptcdrom</literal>" msgstr "a linha <literal>Version:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:824 +#: apt.conf.5.xml:841 msgid "" "Output information about the process of accessing collections of packages " "stored on CD-ROMs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:831 +#: apt.conf.5.xml:848 #, fuzzy msgid "<literal>Debug::BuildDeps</literal>" msgstr "a linha <literal>Label:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:834 +#: apt.conf.5.xml:851 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:841 +#: apt.conf.5.xml:858 #, fuzzy msgid "<literal>Debug::Hashes</literal>" msgstr "a linha <literal>Label:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:844 +#: apt.conf.5.xml:861 msgid "" "Output each cryptographic hash that is generated by the <literal>apt</" "literal> libraries." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:851 +#: apt.conf.5.xml:868 #, fuzzy msgid "<literal>Debug::IdentCDROM</literal>" msgstr "a linha <literal>Label:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:854 +#: apt.conf.5.xml:871 msgid "" "Do not include information from <literal>statfs</literal>, namely the number " "of used and free blocks on the CD-ROM filesystem, when generating an ID for " @@ -5593,99 +5644,99 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:862 +#: apt.conf.5.xml:879 #, fuzzy msgid "<literal>Debug::NoLocking</literal>" msgstr "a linha <literal>Origin:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:865 +#: apt.conf.5.xml:882 msgid "" "Disable all file locking. For instance, this will allow two instances of " "<quote><literal>apt-get update</literal></quote> to run at the same time." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:873 +#: apt.conf.5.xml:890 #, fuzzy msgid "<literal>Debug::pkgAcquire</literal>" msgstr "a linha <literal>Archive:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:877 +#: apt.conf.5.xml:894 msgid "Log when items are added to or removed from the global download queue." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:884 +#: apt.conf.5.xml:901 #, fuzzy msgid "<literal>Debug::pkgAcquire::Auth</literal>" msgstr "a linha <literal>Archive:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:887 +#: apt.conf.5.xml:904 msgid "" "Output status messages and errors related to verifying checksums and " "cryptographic signatures of downloaded files." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:894 +#: apt.conf.5.xml:911 #, fuzzy msgid "<literal>Debug::pkgAcquire::Diffs</literal>" msgstr "a linha <literal>Archive:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:897 +#: apt.conf.5.xml:914 msgid "" "Output information about downloading and applying package index list diffs, " "and errors relating to package index list diffs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:905 +#: apt.conf.5.xml:922 #, fuzzy msgid "<literal>Debug::pkgAcquire::RRed</literal>" msgstr "a linha <literal>Archive:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:909 +#: apt.conf.5.xml:926 msgid "" "Output information related to patching apt package lists when downloading " "index diffs instead of full indices." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:916 +#: apt.conf.5.xml:933 #, fuzzy msgid "<literal>Debug::pkgAcquire::Worker</literal>" msgstr "a linha <literal>Archive:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:920 +#: apt.conf.5.xml:937 msgid "" "Log all interactions with the sub-processes that actually perform downloads." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:927 +#: apt.conf.5.xml:944 msgid "<literal>Debug::pkgAutoRemove</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:931 +#: apt.conf.5.xml:948 msgid "" "Log events related to the automatically-installed status of packages and to " "the removal of unused packages." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:938 +#: apt.conf.5.xml:955 msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:941 +#: apt.conf.5.xml:958 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial auto-" @@ -5695,12 +5746,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:952 +#: apt.conf.5.xml:969 msgid "<literal>Debug::pkgDepCache::Marker</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:955 +#: apt.conf.5.xml:972 msgid "" "Generate debug messages describing which package is marked as keep/install/" "remove while the ProblemResolver does his work. Each addition or deletion " @@ -5717,96 +5768,96 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:974 +#: apt.conf.5.xml:991 #, fuzzy msgid "<literal>Debug::pkgInitConfig</literal>" msgstr "a linha <literal>Version:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:977 +#: apt.conf.5.xml:994 msgid "Dump the default configuration to standard error on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:984 +#: apt.conf.5.xml:1001 #, fuzzy msgid "<literal>Debug::pkgDPkgPM</literal>" msgstr "a linha <literal>Package:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:987 +#: apt.conf.5.xml:1004 msgid "" "When invoking &dpkg;, output the precise command line with which it is being " "invoked, with arguments separated by a single space character." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:995 +#: apt.conf.5.xml:1012 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:998 +#: apt.conf.5.xml:1015 msgid "" "Output all the data received from &dpkg; on the status file descriptor and " "any errors encountered while parsing it." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1005 +#: apt.conf.5.xml:1022 #, fuzzy msgid "<literal>Debug::pkgOrderList</literal>" msgstr "a linha <literal>Origin:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1009 +#: apt.conf.5.xml:1026 msgid "" "Generate a trace of the algorithm that decides the order in which " "<literal>apt</literal> should pass packages to &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1017 +#: apt.conf.5.xml:1034 #, fuzzy msgid "<literal>Debug::pkgPackageManager</literal>" msgstr "a linha <literal>Package:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1021 +#: apt.conf.5.xml:1038 msgid "" "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1028 +#: apt.conf.5.xml:1045 #, fuzzy msgid "<literal>Debug::pkgPolicy</literal>" msgstr "a linha <literal>Label:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1032 +#: apt.conf.5.xml:1049 msgid "Output the priority of each package list on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1038 +#: apt.conf.5.xml:1055 msgid "<literal>Debug::pkgProblemResolver</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1042 +#: apt.conf.5.xml:1059 msgid "" "Trace the execution of the dependency resolver (this applies only to what " "happens when a complex dependency problem is encountered)." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1050 +#: apt.conf.5.xml:1067 msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1053 +#: apt.conf.5.xml:1070 msgid "" "Display a list of all installed packages with their calculated score used by " "the pkgProblemResolver. The description of the package is the same as " @@ -5814,33 +5865,33 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:1061 +#: apt.conf.5.xml:1078 #, fuzzy msgid "<literal>Debug::sourceList</literal>" msgstr "a linha <literal>Version:</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:1065 +#: apt.conf.5.xml:1082 msgid "" "Print information about the vendors read from <filename>/etc/apt/vendors." "list</filename>." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1088 +#: apt.conf.5.xml:1105 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." msgstr "" #. type: Content of: <refentry><refsect1><variablelist> -#: apt.conf.5.xml:1095 +#: apt.conf.5.xml:1112 msgid "&file-aptconf;" msgstr "" #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:1100 +#: apt.conf.5.xml:1117 #, fuzzy msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;" @@ -7347,7 +7398,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml:81 #, no-wrap -msgid "deb uri distribution [component1] [component2] [...]" +msgid "deb [ options ] uri distribution [component1] [component2] [...]" msgstr "" #. type: Content of: <refentry><refsect1><para> @@ -7392,6 +7443,27 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:112 msgid "" +"<literal>options</literal> is always optional and needs to be surounded by " +"square brackets. It can consist of multiple settings in the form " +"<literal><replaceable>setting</replaceable>=<replaceable>value</" +"replaceable></literal>. Multiple settings are separated by spaces. The " +"following settings are supported by APT, note though that unsupported " +"settings will be ignored silently:" +msgstr "" + +#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> +#: sources.list.5.xml:117 +msgid "" +"<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</" +"replaceable>,…</literal> can be used to specify for which architectures " +"packages information should be downloaded. If this option is not set all " +"architectures defined by the <literal>APT::Architectures</literal> option " +"will be downloaded." +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:123 +msgid "" "It is important to list sources in order of preference, with the most " "preferred source listed first. Typically this will result in sorting by " "speed from fastest to slowest (CD-ROM followed by hosts on a local network, " @@ -7399,13 +7471,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:117 +#: sources.list.5.xml:128 #, fuzzy msgid "Some examples:" msgstr "Exemplos" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:119 +#: sources.list.5.xml:130 #, no-wrap msgid "" "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n" @@ -7414,17 +7486,17 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: sources.list.5.xml:125 +#: sources.list.5.xml:136 msgid "URI specification" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: sources.list.5.xml:130 +#: sources.list.5.xml:141 msgid "file" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:132 +#: sources.list.5.xml:143 msgid "" "The file scheme allows an arbitrary directory in the file system to be " "considered an archive. This is useful for NFS mounts and local mirrors or " @@ -7432,14 +7504,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:139 +#: sources.list.5.xml:150 msgid "" "The cdrom scheme allows APT to use a local CDROM drive with media swapping. " "Use the &apt-cdrom; program to create cdrom entries in the source list." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:146 +#: sources.list.5.xml:157 msgid "" "The http scheme specifies an HTTP server for the archive. If an environment " "variable <envar>http_proxy</envar> is set with the format http://server:" @@ -7450,7 +7522,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:157 +#: sources.list.5.xml:168 msgid "" "The ftp scheme specifies an FTP server for the archive. APT's FTP behavior " "is highly configurable; for more information see the &apt-conf; manual page. " @@ -7462,12 +7534,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: sources.list.5.xml:166 +#: sources.list.5.xml:177 msgid "copy" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:168 +#: sources.list.5.xml:179 msgid "" "The copy scheme is identical to the file scheme except that packages are " "copied into the cache directory instead of used directly at their location. " @@ -7475,17 +7547,17 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: sources.list.5.xml:173 +#: sources.list.5.xml:184 msgid "rsh" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: sources.list.5.xml:173 +#: sources.list.5.xml:184 msgid "ssh" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:175 +#: sources.list.5.xml:186 msgid "" "The rsh/ssh method invokes rsh/ssh to connect to a remote host as a given " "user and access the files. It is a good idea to do prior arrangements with " @@ -7495,12 +7567,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: sources.list.5.xml:183 +#: sources.list.5.xml:194 msgid "more recognizable URI types" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: sources.list.5.xml:185 +#: sources.list.5.xml:196 msgid "" "APT can be extended with more methods shipped in other optional packages " "which should follow the nameing scheme <literal>apt-transport-" @@ -7513,75 +7585,91 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:127 +#: sources.list.5.xml:138 msgid "" "The currently recognized URI types are cdrom, file, http, ftp, copy, ssh, " "rsh. <placeholder type=\"variablelist\" id=\"0\"/>" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:199 +#: sources.list.5.xml:210 msgid "" "Uses the archive stored locally (or NFS mounted) at /home/jason/debian for " "stable/main, stable/contrib, and stable/non-free." msgstr "" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:201 +#: sources.list.5.xml:212 #, no-wrap msgid "deb file:/home/jason/debian stable main contrib non-free" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:203 +#: sources.list.5.xml:214 msgid "As above, except this uses the unstable (development) distribution." msgstr "" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:204 +#: sources.list.5.xml:215 #, no-wrap msgid "deb file:/home/jason/debian unstable main contrib non-free" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:206 +#: sources.list.5.xml:217 msgid "Source line for the above" msgstr "" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:207 +#: sources.list.5.xml:218 #, no-wrap msgid "deb-src file:/home/jason/debian unstable main contrib non-free" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:209 +#: sources.list.5.xml:220 +msgid "" +"The first line gets package information for the architectures in " +"<literal>APT::Architectures</literal> while the second always retrieves " +"<literal>amd64</literal> and <literal>armel</literal>." +msgstr "" + +#. type: Content of: <refentry><refsect1><literallayout> +#: sources.list.5.xml:222 +#, no-wrap +msgid "" +"deb http://ftp.debian.org/debian &stable-codename; main\n" +"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main" +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:225 msgid "" "Uses HTTP to access the archive at archive.debian.org, and uses only the " "hamm/main area." msgstr "" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:211 +#: sources.list.5.xml:227 #, no-wrap msgid "deb http://archive.debian.org/debian-archive hamm main" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:213 +#: sources.list.5.xml:229 msgid "" "Uses FTP to access the archive at ftp.debian.org, under the debian " "directory, and uses only the &stable-codename;/contrib area." msgstr "" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:215 +#: sources.list.5.xml:231 #, no-wrap msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:217 +#: sources.list.5.xml:233 msgid "" "Uses FTP to access the archive at ftp.debian.org, under the debian " "directory, and uses only the unstable/contrib area. If this line appears as " @@ -7590,19 +7678,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><literallayout> -#: sources.list.5.xml:221 +#: sources.list.5.xml:237 #, no-wrap msgid "deb ftp://ftp.debian.org/debian unstable contrib" msgstr "" #. type: Content of: <refentry><refsect1><para><literallayout> -#: sources.list.5.xml:230 +#: sources.list.5.xml:246 #, no-wrap msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:223 +#: sources.list.5.xml:239 msgid "" "Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe " "directory, and uses only files found under <filename>unstable/binary-i386</" @@ -7614,7 +7702,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: sources.list.5.xml:235 +#: sources.list.5.xml:251 #, fuzzy msgid "&apt-cache; &apt-conf;" msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;" diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml index fab125b4e..09a5cbb6d 100644 --- a/doc/sources.list.5.xml +++ b/doc/sources.list.5.xml @@ -113,7 +113,7 @@ square brackets. It can consist of multiple settings in the form <literal><replaceable>setting</replaceable>=<replaceable>value</replaceable></literal>. Multiple settings are separated by spaces. The following settings are supported by APT, - note through that unsupported settings will be ignored silently: + note though that unsupported settings will be ignored silently: <itemizedlist><listitem><para><literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</replaceable>,…</literal> can be used to specify for which architectures packages information should be downloaded. If this option is not set all architectures defined by the diff --git a/po/apt-all.pot b/po/apt-all.pot index dd9d75977..f3392d204 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-07-26 12:05+0200\n" +"POT-Creation-Date: 2011-10-14 12:59+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -154,7 +154,7 @@ msgstr "" #: cmdline/apt-cache.cc:1675 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:73 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:589 -#: cmdline/apt-get.cc:3220 cmdline/apt-mark.cc:264 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:3235 cmdline/apt-mark.cc:264 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "" @@ -252,7 +252,7 @@ msgid "" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1149 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1164 #, c-format msgid "Unable to write to %s" msgstr "" @@ -367,7 +367,7 @@ msgstr "" msgid "Archive has no control record" msgstr "" -#: ftparchive/cachedb.cc:448 +#: ftparchive/cachedb.cc:452 msgid "Unable to get a cursor" msgstr "" @@ -723,7 +723,7 @@ msgstr "" msgid "%s is already the newest version.\n" msgstr "" -#: cmdline/apt-get.cc:818 cmdline/apt-get.cc:2088 cmdline/apt-mark.cc:59 +#: cmdline/apt-get.cc:818 cmdline/apt-get.cc:2096 cmdline/apt-mark.cc:59 #, c-format msgid "%s set to manually installed.\n" msgstr "" @@ -738,123 +738,123 @@ msgstr "" msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" msgstr "" -#: cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:891 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "" -#: cmdline/apt-get.cc:971 +#: cmdline/apt-get.cc:969 msgid "Correcting dependencies..." msgstr "" -#: cmdline/apt-get.cc:974 +#: cmdline/apt-get.cc:972 msgid " failed." msgstr "" -#: cmdline/apt-get.cc:977 +#: cmdline/apt-get.cc:975 msgid "Unable to correct dependencies" msgstr "" -#: cmdline/apt-get.cc:980 +#: cmdline/apt-get.cc:978 msgid "Unable to minimize the upgrade set" msgstr "" -#: cmdline/apt-get.cc:982 +#: cmdline/apt-get.cc:980 msgid " Done" msgstr "" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:984 msgid "You might want to run 'apt-get -f install' to correct these." msgstr "" -#: cmdline/apt-get.cc:989 +#: cmdline/apt-get.cc:987 msgid "Unmet dependencies. Try using -f." msgstr "" -#: cmdline/apt-get.cc:1014 +#: cmdline/apt-get.cc:1012 msgid "WARNING: The following packages cannot be authenticated!" msgstr "" -#: cmdline/apt-get.cc:1018 +#: cmdline/apt-get.cc:1016 msgid "Authentication warning overridden.\n" msgstr "" -#: cmdline/apt-get.cc:1025 +#: cmdline/apt-get.cc:1023 msgid "Install these packages without verification [y/N]? " msgstr "" -#: cmdline/apt-get.cc:1027 +#: cmdline/apt-get.cc:1025 msgid "Some packages could not be authenticated" msgstr "" -#: cmdline/apt-get.cc:1036 cmdline/apt-get.cc:1197 +#: cmdline/apt-get.cc:1034 cmdline/apt-get.cc:1195 msgid "There are problems and -y was used without --force-yes" msgstr "" -#: cmdline/apt-get.cc:1077 +#: cmdline/apt-get.cc:1075 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1084 msgid "Packages need to be removed but remove is disabled." msgstr "" -#: cmdline/apt-get.cc:1097 +#: cmdline/apt-get.cc:1095 msgid "Internal error, Ordering didn't finish" msgstr "" -#: cmdline/apt-get.cc:1135 +#: cmdline/apt-get.cc:1133 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1142 +#: cmdline/apt-get.cc:1140 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1147 +#: cmdline/apt-get.cc:1145 #, c-format msgid "Need to get %sB of archives.\n" msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1154 +#: cmdline/apt-get.cc:1152 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1159 +#: cmdline/apt-get.cc:1157 #, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "" -#: cmdline/apt-get.cc:1174 cmdline/apt-get.cc:1177 cmdline/apt-get.cc:2499 -#: cmdline/apt-get.cc:2502 +#: cmdline/apt-get.cc:1172 cmdline/apt-get.cc:1175 cmdline/apt-get.cc:2514 +#: cmdline/apt-get.cc:2517 #, c-format msgid "Couldn't determine free space in %s" msgstr "" -#: cmdline/apt-get.cc:1187 +#: cmdline/apt-get.cc:1185 #, c-format msgid "You don't have enough free space in %s." msgstr "" -#: cmdline/apt-get.cc:1203 cmdline/apt-get.cc:1223 +#: cmdline/apt-get.cc:1201 cmdline/apt-get.cc:1221 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" -#: cmdline/apt-get.cc:1205 +#: cmdline/apt-get.cc:1203 msgid "Yes, do as I say!" msgstr "" -#: cmdline/apt-get.cc:1207 +#: cmdline/apt-get.cc:1205 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -862,46 +862,46 @@ msgid "" " ?] " msgstr "" -#: cmdline/apt-get.cc:1213 cmdline/apt-get.cc:1232 +#: cmdline/apt-get.cc:1211 cmdline/apt-get.cc:1230 msgid "Abort." msgstr "" -#: cmdline/apt-get.cc:1228 +#: cmdline/apt-get.cc:1226 msgid "Do you want to continue [Y/n]? " msgstr "" -#: cmdline/apt-get.cc:1300 cmdline/apt-get.cc:2564 apt-pkg/algorithms.cc:1438 +#: cmdline/apt-get.cc:1298 cmdline/apt-get.cc:2579 apt-pkg/algorithms.cc:1445 #, c-format msgid "Failed to fetch %s %s\n" msgstr "" -#: cmdline/apt-get.cc:1318 +#: cmdline/apt-get.cc:1316 msgid "Some files failed to download" msgstr "" -#: cmdline/apt-get.cc:1319 cmdline/apt-get.cc:2576 +#: cmdline/apt-get.cc:1317 cmdline/apt-get.cc:2591 msgid "Download complete and in download only mode" msgstr "" -#: cmdline/apt-get.cc:1325 +#: cmdline/apt-get.cc:1323 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" msgstr "" -#: cmdline/apt-get.cc:1329 +#: cmdline/apt-get.cc:1327 msgid "--fix-missing and media swapping is not currently supported" msgstr "" -#: cmdline/apt-get.cc:1334 +#: cmdline/apt-get.cc:1332 msgid "Unable to correct missing packages." msgstr "" -#: cmdline/apt-get.cc:1335 +#: cmdline/apt-get.cc:1333 msgid "Aborting install." msgstr "" -#: cmdline/apt-get.cc:1363 +#: cmdline/apt-get.cc:1361 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -911,35 +911,35 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: cmdline/apt-get.cc:1367 +#: cmdline/apt-get.cc:1365 msgid "Note: This is done automatic and on purpose by dpkg." msgstr "" -#: cmdline/apt-get.cc:1505 +#: cmdline/apt-get.cc:1503 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1537 +#: cmdline/apt-get.cc:1535 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1575 +#: cmdline/apt-get.cc:1573 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1591 +#: cmdline/apt-get.cc:1589 msgid "The update command takes no arguments" msgstr "" -#: cmdline/apt-get.cc:1653 +#: cmdline/apt-get.cc:1652 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1748 +#: cmdline/apt-get.cc:1756 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -955,15 +955,15 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1751 cmdline/apt-get.cc:1921 +#: cmdline/apt-get.cc:1759 cmdline/apt-get.cc:1929 msgid "The following information may help to resolve the situation:" msgstr "" -#: cmdline/apt-get.cc:1755 +#: cmdline/apt-get.cc:1763 msgid "Internal Error, AutoRemover broke stuff" msgstr "" -#: cmdline/apt-get.cc:1762 +#: cmdline/apt-get.cc:1770 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -972,7 +972,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: cmdline/apt-get.cc:1766 +#: cmdline/apt-get.cc:1774 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -980,25 +980,25 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: cmdline/apt-get.cc:1768 +#: cmdline/apt-get.cc:1776 msgid "Use 'apt-get autoremove' to remove them." msgstr "" -#: cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1795 msgid "Internal error, AllUpgrade broke stuff" msgstr "" -#: cmdline/apt-get.cc:1886 +#: cmdline/apt-get.cc:1894 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "" -#: cmdline/apt-get.cc:1890 +#: cmdline/apt-get.cc:1898 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -#: cmdline/apt-get.cc:1906 +#: cmdline/apt-get.cc:1914 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1006,80 +1006,80 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: cmdline/apt-get.cc:1924 +#: cmdline/apt-get.cc:1932 msgid "Broken packages" msgstr "" -#: cmdline/apt-get.cc:1950 +#: cmdline/apt-get.cc:1958 msgid "The following extra packages will be installed:" msgstr "" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2048 msgid "Suggested packages:" msgstr "" -#: cmdline/apt-get.cc:2041 +#: cmdline/apt-get.cc:2049 msgid "Recommended packages:" msgstr "" -#: cmdline/apt-get.cc:2083 +#: cmdline/apt-get.cc:2091 #, c-format msgid "Couldn't find package %s" msgstr "" -#: cmdline/apt-get.cc:2090 cmdline/apt-mark.cc:61 +#: cmdline/apt-get.cc:2098 cmdline/apt-mark.cc:61 #, c-format msgid "%s set to automatically installed.\n" msgstr "" -#: cmdline/apt-get.cc:2098 cmdline/apt-mark.cc:105 +#: cmdline/apt-get.cc:2106 cmdline/apt-mark.cc:105 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:2114 +#: cmdline/apt-get.cc:2122 msgid "Calculating upgrade... " msgstr "" -#: cmdline/apt-get.cc:2117 methods/ftp.cc:707 methods/connect.cc:111 +#: cmdline/apt-get.cc:2125 methods/ftp.cc:708 methods/connect.cc:111 msgid "Failed" msgstr "" -#: cmdline/apt-get.cc:2122 +#: cmdline/apt-get.cc:2130 msgid "Done" msgstr "" -#: cmdline/apt-get.cc:2189 cmdline/apt-get.cc:2197 +#: cmdline/apt-get.cc:2197 cmdline/apt-get.cc:2205 msgid "Internal error, problem resolver broke stuff" msgstr "" -#: cmdline/apt-get.cc:2221 cmdline/apt-get.cc:2254 +#: cmdline/apt-get.cc:2233 cmdline/apt-get.cc:2269 msgid "Unable to lock the download directory" msgstr "" -#: cmdline/apt-get.cc:2305 +#: cmdline/apt-get.cc:2320 #, c-format msgid "Downloading %s %s" msgstr "" -#: cmdline/apt-get.cc:2361 +#: cmdline/apt-get.cc:2376 msgid "Must specify at least one package to fetch source for" msgstr "" -#: cmdline/apt-get.cc:2401 cmdline/apt-get.cc:2713 +#: cmdline/apt-get.cc:2416 cmdline/apt-get.cc:2728 #, c-format msgid "Unable to find a source package for %s" msgstr "" -#: cmdline/apt-get.cc:2418 +#: cmdline/apt-get.cc:2433 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:2423 +#: cmdline/apt-get.cc:2438 #, c-format msgid "" "Please use:\n" @@ -1087,141 +1087,141 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:2476 +#: cmdline/apt-get.cc:2491 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "" -#: cmdline/apt-get.cc:2513 +#: cmdline/apt-get.cc:2528 #, c-format msgid "You don't have enough free space in %s" msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2522 +#: cmdline/apt-get.cc:2537 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2527 +#: cmdline/apt-get.cc:2542 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2533 +#: cmdline/apt-get.cc:2548 #, c-format msgid "Fetch source %s\n" msgstr "" -#: cmdline/apt-get.cc:2571 +#: cmdline/apt-get.cc:2586 msgid "Failed to fetch some archives." msgstr "" -#: cmdline/apt-get.cc:2602 +#: cmdline/apt-get.cc:2617 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2614 +#: cmdline/apt-get.cc:2629 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2615 +#: cmdline/apt-get.cc:2630 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2637 +#: cmdline/apt-get.cc:2652 #, c-format msgid "Build command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2657 +#: cmdline/apt-get.cc:2672 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2676 +#: cmdline/apt-get.cc:2691 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2701 +#: cmdline/apt-get.cc:2716 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:2718 +#: cmdline/apt-get.cc:2733 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2738 +#: cmdline/apt-get.cc:2753 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:2868 +#: cmdline/apt-get.cc:2883 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" msgstr "" -#: cmdline/apt-get.cc:2889 +#: cmdline/apt-get.cc:2904 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:2912 +#: cmdline/apt-get.cc:2927 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:2951 +#: cmdline/apt-get.cc:2966 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " "package %s can't satisfy version requirements" msgstr "" -#: cmdline/apt-get.cc:2957 +#: cmdline/apt-get.cc:2972 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "" -#: cmdline/apt-get.cc:2980 +#: cmdline/apt-get.cc:2995 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:2996 +#: cmdline/apt-get.cc:3011 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:3001 +#: cmdline/apt-get.cc:3016 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:3094 cmdline/apt-get.cc:3106 +#: cmdline/apt-get.cc:3109 cmdline/apt-get.cc:3121 #, c-format msgid "Changelog for %s (%s)" msgstr "" -#: cmdline/apt-get.cc:3225 +#: cmdline/apt-get.cc:3240 msgid "Supported modules:" msgstr "" -#: cmdline/apt-get.cc:3266 +#: cmdline/apt-get.cc:3281 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1267,7 +1267,7 @@ msgid "" " This APT has Super Cow Powers.\n" msgstr "" -#: cmdline/apt-get.cc:3429 +#: cmdline/apt-get.cc:3444 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1560,8 +1560,8 @@ msgstr "" #. Only warn if there is no sources.list file. #: apt-inst/extract.cc:462 apt-pkg/contrib/cdromutl.cc:179 #: apt-pkg/contrib/fileutl.cc:343 apt-pkg/sourcelist.cc:204 -#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:450 apt-pkg/init.cc:104 -#: apt-pkg/init.cc:112 apt-pkg/clean.cc:33 apt-pkg/policy.cc:352 +#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:454 apt-pkg/init.cc:103 +#: apt-pkg/init.cc:111 apt-pkg/clean.cc:33 apt-pkg/policy.cc:353 #: methods/mirror.cc:91 #, c-format msgid "Unable to read %s" @@ -1591,9 +1591,9 @@ msgstr "" msgid "The info and temp directories need to be on the same filesystem" msgstr "" -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1048 -#: apt-pkg/pkgcachegen.cc:1152 apt-pkg/pkgcachegen.cc:1158 -#: apt-pkg/pkgcachegen.cc:1320 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1063 +#: apt-pkg/pkgcachegen.cc:1167 apt-pkg/pkgcachegen.cc:1173 +#: apt-pkg/pkgcachegen.cc:1335 msgid "Reading package lists" msgstr "" @@ -1710,41 +1710,41 @@ msgid "Read error from %s process" msgstr "" #: methods/bzip2.cc:140 methods/bzip2.cc:149 methods/copy.cc:43 -#: methods/gzip.cc:92 methods/gzip.cc:101 methods/rred.cc:524 -#: methods/rred.cc:533 +#: methods/gzip.cc:92 methods/gzip.cc:101 methods/rred.cc:527 +#: methods/rred.cc:536 msgid "Failed to stat" msgstr "" #: methods/bzip2.cc:146 methods/copy.cc:80 methods/gzip.cc:98 -#: methods/rred.cc:530 +#: methods/rred.cc:533 msgid "Failed to set modification time" msgstr "" -#: methods/cdrom.cc:199 +#: methods/cdrom.cc:200 #, c-format msgid "Unable to read the cdrom database %s" msgstr "" -#: methods/cdrom.cc:208 +#: methods/cdrom.cc:209 msgid "" "Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update " "cannot be used to add new CD-ROMs" msgstr "" -#: methods/cdrom.cc:218 +#: methods/cdrom.cc:219 msgid "Wrong CD-ROM" msgstr "" -#: methods/cdrom.cc:245 +#: methods/cdrom.cc:246 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "" -#: methods/cdrom.cc:250 +#: methods/cdrom.cc:251 msgid "Disk not found." msgstr "" -#: methods/cdrom.cc:258 methods/file.cc:79 methods/rsh.cc:265 +#: methods/cdrom.cc:259 methods/file.cc:79 methods/rsh.cc:265 msgid "File not found" msgstr "" @@ -1753,147 +1753,147 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:168 +#: methods/ftp.cc:169 msgid "Logging in" msgstr "" -#: methods/ftp.cc:174 +#: methods/ftp.cc:175 msgid "Unable to determine the peer name" msgstr "" -#: methods/ftp.cc:179 +#: methods/ftp.cc:180 msgid "Unable to determine the local name" msgstr "" -#: methods/ftp.cc:210 methods/ftp.cc:238 +#: methods/ftp.cc:211 methods/ftp.cc:239 #, c-format msgid "The server refused the connection and said: %s" msgstr "" -#: methods/ftp.cc:216 +#: methods/ftp.cc:217 #, c-format msgid "USER failed, server said: %s" msgstr "" -#: methods/ftp.cc:223 +#: methods/ftp.cc:224 #, c-format msgid "PASS failed, server said: %s" msgstr "" -#: methods/ftp.cc:243 +#: methods/ftp.cc:244 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." msgstr "" -#: methods/ftp.cc:271 +#: methods/ftp.cc:272 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "" -#: methods/ftp.cc:297 +#: methods/ftp.cc:298 #, c-format msgid "TYPE failed, server said: %s" msgstr "" -#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:184 methods/rsh.cc:227 +#: methods/ftp.cc:336 methods/ftp.cc:447 methods/rsh.cc:184 methods/rsh.cc:227 msgid "Connection timeout" msgstr "" -#: methods/ftp.cc:341 +#: methods/ftp.cc:342 msgid "Server closed the connection" msgstr "" -#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:820 methods/rsh.cc:191 +#: methods/ftp.cc:345 apt-pkg/contrib/fileutl.cc:831 methods/rsh.cc:191 msgid "Read error" msgstr "" -#: methods/ftp.cc:351 methods/rsh.cc:198 +#: methods/ftp.cc:352 methods/rsh.cc:198 msgid "A response overflowed the buffer." msgstr "" -#: methods/ftp.cc:368 methods/ftp.cc:380 +#: methods/ftp.cc:369 methods/ftp.cc:381 msgid "Protocol corruption" msgstr "" -#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:862 methods/rsh.cc:233 +#: methods/ftp.cc:453 apt-pkg/contrib/fileutl.cc:873 methods/rsh.cc:233 msgid "Write error" msgstr "" -#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734 +#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735 msgid "Could not create a socket" msgstr "" -#: methods/ftp.cc:703 +#: methods/ftp.cc:704 msgid "Could not connect data socket, connection timed out" msgstr "" -#: methods/ftp.cc:709 +#: methods/ftp.cc:710 msgid "Could not connect passive socket." msgstr "" -#: methods/ftp.cc:727 +#: methods/ftp.cc:728 msgid "getaddrinfo was unable to get a listening socket" msgstr "" -#: methods/ftp.cc:741 +#: methods/ftp.cc:742 msgid "Could not bind a socket" msgstr "" -#: methods/ftp.cc:745 +#: methods/ftp.cc:746 msgid "Could not listen on the socket" msgstr "" -#: methods/ftp.cc:752 +#: methods/ftp.cc:753 msgid "Could not determine the socket's name" msgstr "" -#: methods/ftp.cc:784 +#: methods/ftp.cc:785 msgid "Unable to send PORT command" msgstr "" -#: methods/ftp.cc:794 +#: methods/ftp.cc:795 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "" -#: methods/ftp.cc:803 +#: methods/ftp.cc:804 #, c-format msgid "EPRT failed, server said: %s" msgstr "" -#: methods/ftp.cc:823 +#: methods/ftp.cc:824 msgid "Data socket connect timed out" msgstr "" -#: methods/ftp.cc:830 +#: methods/ftp.cc:831 msgid "Unable to accept connection" msgstr "" -#: methods/ftp.cc:869 methods/http.cc:1023 methods/rsh.cc:303 +#: methods/ftp.cc:870 methods/http.cc:1023 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "" -#: methods/ftp.cc:882 +#: methods/ftp.cc:883 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "" -#: methods/ftp.cc:897 methods/rsh.cc:322 +#: methods/ftp.cc:898 methods/rsh.cc:322 msgid "Data socket timed out" msgstr "" -#: methods/ftp.cc:927 +#: methods/ftp.cc:928 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "" #. Get the files information -#: methods/ftp.cc:1004 +#: methods/ftp.cc:1005 msgid "Query" msgstr "" -#: methods/ftp.cc:1116 +#: methods/ftp.cc:1117 msgid "Unable to invoke " msgstr "" @@ -2123,7 +2123,7 @@ msgstr "" msgid "%lis" msgstr "" -#: apt-pkg/contrib/strutl.cc:1138 +#: apt-pkg/contrib/strutl.cc:1137 #, c-format msgid "Selection %s not found" msgstr "" @@ -2198,43 +2198,43 @@ msgstr "" msgid "Command line option '%c' [from %s] is not known." msgstr "" -#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111 -#: apt-pkg/contrib/cmndline.cc:119 +#: apt-pkg/contrib/cmndline.cc:101 apt-pkg/contrib/cmndline.cc:109 +#: apt-pkg/contrib/cmndline.cc:117 #, c-format msgid "Command line option %s is not understood" msgstr "" -#: apt-pkg/contrib/cmndline.cc:124 +#: apt-pkg/contrib/cmndline.cc:122 #, c-format msgid "Command line option %s is not boolean" msgstr "" -#: apt-pkg/contrib/cmndline.cc:165 apt-pkg/contrib/cmndline.cc:186 +#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 #, c-format msgid "Option %s requires an argument." msgstr "" -#: apt-pkg/contrib/cmndline.cc:200 apt-pkg/contrib/cmndline.cc:206 +#: apt-pkg/contrib/cmndline.cc:197 apt-pkg/contrib/cmndline.cc:203 #, c-format msgid "Option %s: Configuration item specification must have an =<val>." msgstr "" -#: apt-pkg/contrib/cmndline.cc:236 +#: apt-pkg/contrib/cmndline.cc:232 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "" -#: apt-pkg/contrib/cmndline.cc:267 +#: apt-pkg/contrib/cmndline.cc:263 #, c-format msgid "Option '%s' is too long" msgstr "" -#: apt-pkg/contrib/cmndline.cc:300 +#: apt-pkg/contrib/cmndline.cc:295 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "" -#: apt-pkg/contrib/cmndline.cc:350 +#: apt-pkg/contrib/cmndline.cc:345 #, c-format msgid "Invalid operation %s" msgstr "" @@ -2245,7 +2245,7 @@ msgid "Unable to stat the mount point %s" msgstr "" #: apt-pkg/contrib/cdromutl.cc:175 apt-pkg/contrib/cdromutl.cc:209 -#: apt-pkg/acquire.cc:456 apt-pkg/acquire.cc:481 apt-pkg/clean.cc:39 +#: apt-pkg/acquire.cc:460 apt-pkg/acquire.cc:485 apt-pkg/clean.cc:39 #: methods/mirror.cc:97 #, c-format msgid "Unable to change to %s" @@ -2296,72 +2296,72 @@ msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:679 +#: apt-pkg/contrib/fileutl.cc:690 #, c-format msgid "Waited for %s but it wasn't there" msgstr "" -#: apt-pkg/contrib/fileutl.cc:691 +#: apt-pkg/contrib/fileutl.cc:702 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "" -#: apt-pkg/contrib/fileutl.cc:693 +#: apt-pkg/contrib/fileutl.cc:704 #, c-format msgid "Sub-process %s received signal %u." msgstr "" -#: apt-pkg/contrib/fileutl.cc:697 +#: apt-pkg/contrib/fileutl.cc:708 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "" -#: apt-pkg/contrib/fileutl.cc:699 +#: apt-pkg/contrib/fileutl.cc:710 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "" -#: apt-pkg/contrib/fileutl.cc:764 apt-pkg/indexcopy.cc:673 +#: apt-pkg/contrib/fileutl.cc:775 apt-pkg/indexcopy.cc:673 #, c-format msgid "Could not open file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:781 +#: apt-pkg/contrib/fileutl.cc:792 #, c-format msgid "Could not open file descriptor %d" msgstr "" -#: apt-pkg/contrib/fileutl.cc:841 +#: apt-pkg/contrib/fileutl.cc:852 #, c-format msgid "read, still have %lu to read but none left" msgstr "" -#: apt-pkg/contrib/fileutl.cc:874 +#: apt-pkg/contrib/fileutl.cc:885 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1010 +#: apt-pkg/contrib/fileutl.cc:1021 #, c-format msgid "Problem closing the gzip file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1013 +#: apt-pkg/contrib/fileutl.cc:1024 #, c-format msgid "Problem closing the file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1018 +#: apt-pkg/contrib/fileutl.cc:1029 #, c-format msgid "Problem renaming the file %s to %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1029 +#: apt-pkg/contrib/fileutl.cc:1040 #, c-format msgid "Problem unlinking the file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1042 +#: apt-pkg/contrib/fileutl.cc:1053 msgid "Problem syncing the file" msgstr "" @@ -2548,7 +2548,7 @@ msgstr "" msgid "Type '%s' is not known on line %u in source list %s" msgstr "" -#: apt-pkg/packagemanager.cc:335 apt-pkg/packagemanager.cc:623 +#: apt-pkg/packagemanager.cc:335 apt-pkg/packagemanager.cc:645 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " @@ -2591,7 +2591,7 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "" -#: apt-pkg/algorithms.cc:1464 apt-pkg/algorithms.cc:1466 +#: apt-pkg/algorithms.cc:1471 apt-pkg/algorithms.cc:1473 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -2614,12 +2614,12 @@ msgstr "" #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:857 +#: apt-pkg/acquire.cc:861 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "" -#: apt-pkg/acquire.cc:859 +#: apt-pkg/acquire.cc:863 #, c-format msgid "Retrieving file %li of %li" msgstr "" @@ -2639,12 +2639,12 @@ msgstr "" msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" -#: apt-pkg/init.cc:147 +#: apt-pkg/init.cc:146 #, c-format msgid "Packaging system '%s' is not supported" msgstr "" -#: apt-pkg/init.cc:163 +#: apt-pkg/init.cc:162 msgid "Unable to determine a suitable packaging system type" msgstr "" @@ -2669,24 +2669,24 @@ msgstr "" msgid "The list of sources could not be read." msgstr "" -#: apt-pkg/policy.cc:71 +#: apt-pkg/policy.cc:72 #, c-format msgid "" "The value '%s' is invalid for APT::Default-Release as such a release is not " "available in the sources" msgstr "" -#: apt-pkg/policy.cc:389 +#: apt-pkg/policy.cc:390 #, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "" -#: apt-pkg/policy.cc:411 +#: apt-pkg/policy.cc:412 #, c-format msgid "Did not understand pin type %s" msgstr "" -#: apt-pkg/policy.cc:419 +#: apt-pkg/policy.cc:420 msgid "No priority (or zero) specified for pin" msgstr "" @@ -2694,88 +2694,88 @@ msgstr "" msgid "Cache has an incompatible versioning system" msgstr "" -#: apt-pkg/pkgcachegen.cc:187 +#: apt-pkg/pkgcachegen.cc:190 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "" -#: apt-pkg/pkgcachegen.cc:204 +#: apt-pkg/pkgcachegen.cc:207 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "" -#: apt-pkg/pkgcachegen.cc:242 +#: apt-pkg/pkgcachegen.cc:245 #, c-format msgid "Error occurred while processing %s (NewFileDesc1)" msgstr "" -#: apt-pkg/pkgcachegen.cc:274 +#: apt-pkg/pkgcachegen.cc:277 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "" -#: apt-pkg/pkgcachegen.cc:278 +#: apt-pkg/pkgcachegen.cc:281 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "" -#: apt-pkg/pkgcachegen.cc:295 apt-pkg/pkgcachegen.cc:305 -#: apt-pkg/pkgcachegen.cc:313 +#: apt-pkg/pkgcachegen.cc:298 apt-pkg/pkgcachegen.cc:308 +#: apt-pkg/pkgcachegen.cc:316 #, c-format msgid "Error occurred while processing %s (NewVersion%d)" msgstr "" -#: apt-pkg/pkgcachegen.cc:309 +#: apt-pkg/pkgcachegen.cc:312 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "" -#: apt-pkg/pkgcachegen.cc:342 +#: apt-pkg/pkgcachegen.cc:345 #, c-format msgid "Error occurred while processing %s (NewFileDesc2)" msgstr "" -#: apt-pkg/pkgcachegen.cc:348 +#: apt-pkg/pkgcachegen.cc:351 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:351 +#: apt-pkg/pkgcachegen.cc:354 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:354 +#: apt-pkg/pkgcachegen.cc:357 msgid "Wow, you exceeded the number of descriptions this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:357 +#: apt-pkg/pkgcachegen.cc:360 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:386 +#: apt-pkg/pkgcachegen.cc:389 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "" -#: apt-pkg/pkgcachegen.cc:400 +#: apt-pkg/pkgcachegen.cc:403 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "" -#: apt-pkg/pkgcachegen.cc:406 +#: apt-pkg/pkgcachegen.cc:409 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" -#: apt-pkg/pkgcachegen.cc:960 +#: apt-pkg/pkgcachegen.cc:975 #, c-format msgid "Couldn't stat source package list %s" msgstr "" -#: apt-pkg/pkgcachegen.cc:1065 +#: apt-pkg/pkgcachegen.cc:1080 msgid "Collecting File Provides" msgstr "" -#: apt-pkg/pkgcachegen.cc:1259 apt-pkg/pkgcachegen.cc:1266 +#: apt-pkg/pkgcachegen.cc:1274 apt-pkg/pkgcachegen.cc:1281 msgid "IO Error saving source cache" msgstr "" @@ -2788,12 +2788,12 @@ msgstr "" msgid "MD5Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1848 -#: apt-pkg/acquire-item.cc:1991 +#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1847 +#: apt-pkg/acquire-item.cc:1990 msgid "Hash Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:1388 +#: apt-pkg/acquire-item.cc:1387 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -2805,23 +2805,23 @@ msgstr "" msgid "Unable to find hash sum for '%s' in Release file" msgstr "" -#: apt-pkg/acquire-item.cc:1439 +#: apt-pkg/acquire-item.cc:1438 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1477 +#: apt-pkg/acquire-item.cc:1476 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1499 +#: apt-pkg/acquire-item.cc:1498 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1532 +#: apt-pkg/acquire-item.cc:1531 #, c-format msgid "" "A error occurred during the signature verification. The repository is not " @@ -2829,32 +2829,32 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547 +#: apt-pkg/acquire-item.cc:1541 apt-pkg/acquire-item.cc:1546 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1639 +#: apt-pkg/acquire-item.cc:1638 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "" -#: apt-pkg/acquire-item.cc:1698 +#: apt-pkg/acquire-item.cc:1697 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package." msgstr "" -#: apt-pkg/acquire-item.cc:1753 +#: apt-pkg/acquire-item.cc:1752 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/acquire-item.cc:1840 +#: apt-pkg/acquire-item.cc:1839 msgid "Size mismatch" msgstr "" @@ -2878,7 +2878,7 @@ msgstr "" msgid "Invalid 'Valid-Until' entry in Release file %s" msgstr "" -#: apt-pkg/indexrecords.cc:125 +#: apt-pkg/indexrecords.cc:129 #, c-format msgid "Invalid 'Date' entry in Release file %s" msgstr "" @@ -2970,22 +2970,22 @@ msgstr "" msgid "Source list entries for this disc are:\n" msgstr "" -#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:928 +#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:927 #, c-format msgid "Wrote %i records.\n" msgstr "" -#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:930 +#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:929 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "" -#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:933 +#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:932 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "" -#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:936 +#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:935 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@ -3144,42 +3144,42 @@ msgstr "" msgid "Completely removed %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1082 +#: apt-pkg/deb/dpkgpm.cc:1087 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1113 +#: apt-pkg/deb/dpkgpm.cc:1118 msgid "Running dpkg" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1338 +#: apt-pkg/deb/dpkgpm.cc:1344 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1343 +#: apt-pkg/deb/dpkgpm.cc:1349 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1345 +#: apt-pkg/deb/dpkgpm.cc:1351 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1351 +#: apt-pkg/deb/dpkgpm.cc:1357 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1357 +#: apt-pkg/deb/dpkgpm.cc:1363 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1364 +#: apt-pkg/deb/dpkgpm.cc:1370 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" @@ -3227,14 +3227,14 @@ msgstr "" msgid "[Mirror: %s]" msgstr "" -#: methods/rred.cc:503 +#: methods/rred.cc:506 #, c-format msgid "" "Could not patch %s with mmap and with file operation usage - the patch seems " "to be corrupt." msgstr "" -#: methods/rred.cc:508 +#: methods/rred.cc:511 #, c-format msgid "" "Could not patch %s with mmap (but no mmap specific fail) - the patch seems " -- cgit v1.2.3-70-g09d2 From baf685fd1dda8e154aed454544d838ed93ef5be4 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode <jak@debian.org> Date: Mon, 21 Nov 2011 18:53:29 +0100 Subject: apt-pkg/cdrom.cc: Accept .bz2, .xz files in addition to .gz files (Closes: #649451) --- apt-pkg/cdrom.cc | 15 +++++++++++---- debian/changelog | 7 +++++++ 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc index a9c63fd21..d1bc1f3ba 100644 --- a/apt-pkg/cdrom.cc +++ b/apt-pkg/cdrom.cc @@ -81,7 +81,8 @@ bool pkgCdrom::FindPackages(string CD, /* Aha! We found some package files. We assume that everything under this dir is controlled by those package files so we don't look down anymore */ - if (stat("Packages",&Buf) == 0 || stat("Packages.gz",&Buf) == 0) + if (stat("Packages",&Buf) == 0 || stat("Packages.gz",&Buf) == 0 || + stat("Packages.bz2",&Buf) == 0 || stat("Packages.xz",&Buf) == 0) { List.push_back(CD); @@ -89,7 +90,8 @@ bool pkgCdrom::FindPackages(string CD, if (_config->FindB("APT::CDROM::Thorough",false) == false) return true; } - if (stat("Sources.gz",&Buf) == 0 || stat("Sources",&Buf) == 0) + if (stat("Sources.xz",&Buf) == 0 || stat("Sources.bz2",&Buf) == 0 || + stat("Sources.gz",&Buf) == 0 || stat("Sources",&Buf) == 0) { SList.push_back(CD); @@ -109,8 +111,11 @@ bool pkgCdrom::FindPackages(string CD, if (_config->FindB("Debug::aptcdrom",false) == true) std::clog << "found translations: " << Dir->d_name << "\n"; string file = Dir->d_name; - if(file.substr(file.size()-3,file.size()) == ".gz") + if(file.substr(file.size()-3,file.size()) == ".gz" || + file.substr(file.size()-3,file.size()) == ".xz") file = file.substr(0,file.size()-3); + if(file.substr(file.size()-4,file.size()) == ".bz2") + file = file.substr(0,file.size()-4); TransList.push_back(CD+"i18n/"+ file); } } @@ -258,7 +263,9 @@ bool pkgCdrom::DropRepeats(vector<string> &List,const char *Name) { struct stat Buf; if (stat((List[I] + Name).c_str(),&Buf) != 0 && - stat((List[I] + Name + ".gz").c_str(),&Buf) != 0) + stat((List[I] + Name + ".gz").c_str(),&Buf) != 0 && + stat((List[I] + Name + ".bz2").c_str(),&Buf) != 0 && + stat((List[I] + Name + ".xz").c_str(),&Buf) != 0) _error->Errno("stat","Failed to stat %s%s",List[I].c_str(), Name); Inodes[I] = Buf.st_ino; diff --git a/debian/changelog b/debian/changelog index df50eefbd..fab547fc8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +apt (0.8.16~exp9) UNRELEASED; urgency=low + + * apt-pkg/cdrom.cc: + - Accept .bz2, .xz files in addition to .gz files (Closes: #649451) + + -- Julian Andres Klode <jak@debian.org> Mon, 21 Nov 2011 18:46:36 +0100 + apt (0.8.16~exp8) experimental; urgency=low [ David Kalnischkies ] -- cgit v1.2.3-70-g09d2 From cb1a690cbab6d83b0301f65761d9c49d682dc678 Mon Sep 17 00:00:00 2001 From: Michael Vogt <michael.vogt@ubuntu.com> Date: Tue, 22 Nov 2011 10:41:25 +0100 Subject: merged libapt multiarch enable patch from Colin Watson, many thanks! --- .bzrignore | 2 ++ debian/changelog | 9 +++++++++ debian/control | 21 ++++++++++++++++++--- debian/libapt-inst1.4.install | 3 +-- debian/libapt-pkg-dev.dirs | 2 -- debian/libapt-pkg-dev.install | 4 ++-- debian/libapt-pkg4.12.install | 3 +-- debian/rules | 31 +++++++++++++++++++++++++++---- 8 files changed, 60 insertions(+), 15 deletions(-) delete mode 100644 debian/libapt-pkg-dev.dirs diff --git a/.bzrignore b/.bzrignore index 7c4b11b10..dab38cf71 100644 --- a/.bzrignore +++ b/.bzrignore @@ -10,6 +10,8 @@ build/ configure buildlib/config.sub buildlib/config.guess +debian/libapt-pkg[0-9]*.install +debian/libapt-inst[0-9]*.install # abichecker related files/dir abicheck/apt_build.xml diff --git a/debian/changelog b/debian/changelog index fab547fc8..fa1bd7c47 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,17 @@ apt (0.8.16~exp9) UNRELEASED; urgency=low + [ Julian Andres Klode ] * apt-pkg/cdrom.cc: - Accept .bz2, .xz files in addition to .gz files (Closes: #649451) + [ Colin Watson ] + * Convert libapt-pkg4.12 and libapt-inst1.4 to Multi-Arch: same. + + [ Michael Vogt ] + * debian/control: + - bump debhelper build-dep to debhelper (>= 8.1.3~) + - set libapt-pkg-dev to multi-arch: same too + -- Julian Andres Klode <jak@debian.org> Mon, 21 Nov 2011 18:46:36 +0100 apt (0.8.16~exp8) experimental; urgency=low diff --git a/debian/control b/debian/control index 7efb6ca8a..24c429ad4 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Uploaders: Michael Vogt <mvo@debian.org>, Otavio Salvador <otavio@debian.org>, Christian Perrier <bubulle@debian.org>, Daniel Burrows <dburrows@debian.org>, Julian Andres Klode <jak@debian.org> Standards-Version: 3.9.2 -Build-Depends: dpkg-dev (>= 1.15.8), debhelper (>= 7.2.3~), libdb-dev, +Build-Depends: dpkg-dev (>= 1.15.8), debhelper (>= 8.1.3~), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev (>= 7.19.0), zlib1g-dev | libz-dev, debiandoc-sgml, xsltproc, docbook-xsl, docbook-xml, po4a (>= 0.34-2), autotools-dev, autoconf, automake, doxygen @@ -35,9 +35,20 @@ Description: APT's commandline package manager * apt-config as an interface to the configuration settings * apt-key as an interface to manage authentication keys +Package: libapt-common +Architecture: all +Multi-Arch: foreign +Depends: ${misc:Depends} +Breaks: libapt-pkg4.12 (<< 0.8.16~exp9), libapt-inst1.4 (<< 0.8.16~exp9) +Replaces: libapt-pkg4.12 (<< 0.8.16~exp9), libapt-inst1.4 (<< 0.8.16~exp9) +Description: Common files for APT libraries + This package includes translation files common to APT library packages. + Package: libapt-pkg4.12 Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} +Depends: ${shlibs:Depends}, ${misc:Depends}, libapt-common Description: APT's package managment runtime library This library provides the common functionality for searching and managing packages as well as information about packages. @@ -56,7 +67,9 @@ Description: APT's package managment runtime library Package: libapt-inst1.4 Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} +Depends: ${shlibs:Depends}, ${misc:Depends}, libapt-common Description: APT's deb package format runtime library This library provides methods to query and extract information from deb packages. This includes the control data and the package @@ -73,7 +86,9 @@ Description: Documentation for APT Package: libapt-pkg-dev Architecture: any +Multi-Arch: same Priority: optional +Pre-Depends: ${misc:Pre-Depends} Depends: ${libapt-pkg-name} (= ${binary:Version}), ${libapt-inst-name} (= ${binary:Version}), ${misc:Depends}, zlib1g-dev | zlib-dev Section: libdevel Description: Development files for APT's libapt-pkg and libapt-inst diff --git a/debian/libapt-inst1.4.install b/debian/libapt-inst1.4.install index b7b63be81..b81d15c10 100644 --- a/debian/libapt-inst1.4.install +++ b/debian/libapt-inst1.4.install @@ -1,2 +1 @@ -bin/libapt-inst*.so.* usr/lib/ -usr/share/locale/*/*/libapt-inst*.mo +bin/libapt-inst*.so.* usr/lib/@DEB_HOST_MULTIARCH@/ diff --git a/debian/libapt-pkg-dev.dirs b/debian/libapt-pkg-dev.dirs deleted file mode 100644 index 844642ab0..000000000 --- a/debian/libapt-pkg-dev.dirs +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib -usr/include/apt-pkg diff --git a/debian/libapt-pkg-dev.install b/debian/libapt-pkg-dev.install index bd1a6c174..be8022107 100644 --- a/debian/libapt-pkg-dev.install +++ b/debian/libapt-pkg-dev.install @@ -1,3 +1,3 @@ -bin/libapt-pkg*.so usr/lib/ -bin/libapt-inst*.so usr/lib/ +bin/libapt-pkg*.so usr/lib/@DEB_HOST_MULTIARCH@/ +bin/libapt-inst*.so usr/lib/@DEB_HOST_MULTIARCH@/ include/apt-pkg/*.h usr/include/apt-pkg/ diff --git a/debian/libapt-pkg4.12.install b/debian/libapt-pkg4.12.install index 91b39a31b..0db4075fa 100644 --- a/debian/libapt-pkg4.12.install +++ b/debian/libapt-pkg4.12.install @@ -1,2 +1 @@ -bin/libapt-pkg*.so.* usr/lib/ -usr/share/locale/*/*/libapt-pkg*.mo +bin/libapt-pkg*.so.* usr/lib/@DEB_HOST_MULTIARCH@/ diff --git a/debian/rules b/debian/rules index 30474c06b..6a5c95d22 100755 --- a/debian/rules +++ b/debian/rules @@ -5,6 +5,7 @@ export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +export DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) # FOR AUTOCONF 2.52 AND NEWER ONLY ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) @@ -118,9 +119,31 @@ clean: [ ! -f Makefile ] || $(MAKE) clean distclean rm -rf build + rm -f debian/$(LIBAPT_PKG).install debian/$(LIBAPT_INST).install \ + debian/libapt-pkg-dev.install -binary-indep: apt-doc libapt-pkg-doc +debian/%.install: debian/%.install.in + sed 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' $< > $@ + +binary-indep: libapt-common apt-doc libapt-pkg-doc # Build architecture-independent files here. +libapt-common: build + dh_testdir -p$@ + dh_testroot -p$@ + dh_prep -p$@ + dh_installdirs -p$@ + + dh_install -p$@ --sourcedir=$(BLD) + dh_installdocs -p$@ + dh_installchangelogs -p$@ + dh_strip -p$@ + dh_compress -p$@ + dh_fixperms -p$@ + dh_installdeb -p$@ + dh_gencontrol -p$@ + dh_md5sums -p$@ + dh_builddeb -p$@ + libapt-pkg-doc: build-doc dh_testdir -p$@ dh_testroot -p$@ @@ -217,7 +240,7 @@ apt: build build-doc dh_md5sums -p$@ dh_builddeb -p$@ -libapt-pkg-dev: build +libapt-pkg-dev: build debian/libapt-pkg-dev.install dh_testdir -p$@ dh_testroot -p$@ dh_prep -p$@ @@ -265,7 +288,7 @@ apt-utils: build dh_md5sums -p$@ dh_builddeb -p$@ -$(LIBAPT_PKG): build +$(LIBAPT_PKG): build debian/$(LIBAPT_PKG).install dh_testdir -p$@ dh_testroot -p$@ dh_prep -p$@ @@ -284,7 +307,7 @@ $(LIBAPT_PKG): build dh_md5sums -p$@ dh_builddeb -p$@ -$(LIBAPT_INST): build +$(LIBAPT_INST): build debian/$(LIBAPT_INST).install dh_testdir -p$@ dh_testroot -p$@ dh_prep -p$@ -- cgit v1.2.3-70-g09d2 From b11110d983a5aeb2a36a71689c99f50f7c1f46bc Mon Sep 17 00:00:00 2001 From: Michael Vogt <michael.vogt@ubuntu.com> Date: Tue, 22 Nov 2011 11:20:33 +0100 Subject: rename .install to .install.in when needed --- configure.in | 2 +- debian/libapt-inst1.4.install | 1 - debian/libapt-inst1.4.install.in | 1 + debian/libapt-pkg4.12.install | 1 - debian/libapt-pkg4.12.install.in | 1 + po/apt-all.pot | 3260 -------------------------------------- 6 files changed, 3 insertions(+), 3263 deletions(-) delete mode 100644 debian/libapt-inst1.4.install create mode 100644 debian/libapt-inst1.4.install.in delete mode 100644 debian/libapt-pkg4.12.install create mode 100644 debian/libapt-pkg4.12.install.in delete mode 100644 po/apt-all.pot diff --git a/configure.in b/configure.in index c2602cf36..065afccf1 100644 --- a/configure.in +++ b/configure.in @@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib) AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) dnl -- SET THIS TO THE RELEASE VERSION -- -AC_DEFINE_UNQUOTED(VERSION,"0.8.16~exp6") +AC_DEFINE_UNQUOTED(VERSION,"0.8.16~exp9") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --git a/debian/libapt-inst1.4.install b/debian/libapt-inst1.4.install deleted file mode 100644 index b81d15c10..000000000 --- a/debian/libapt-inst1.4.install +++ /dev/null @@ -1 +0,0 @@ -bin/libapt-inst*.so.* usr/lib/@DEB_HOST_MULTIARCH@/ diff --git a/debian/libapt-inst1.4.install.in b/debian/libapt-inst1.4.install.in new file mode 100644 index 000000000..b81d15c10 --- /dev/null +++ b/debian/libapt-inst1.4.install.in @@ -0,0 +1 @@ +bin/libapt-inst*.so.* usr/lib/@DEB_HOST_MULTIARCH@/ diff --git a/debian/libapt-pkg4.12.install b/debian/libapt-pkg4.12.install deleted file mode 100644 index 0db4075fa..000000000 --- a/debian/libapt-pkg4.12.install +++ /dev/null @@ -1 +0,0 @@ -bin/libapt-pkg*.so.* usr/lib/@DEB_HOST_MULTIARCH@/ diff --git a/debian/libapt-pkg4.12.install.in b/debian/libapt-pkg4.12.install.in new file mode 100644 index 000000000..0db4075fa --- /dev/null +++ b/debian/libapt-pkg4.12.install.in @@ -0,0 +1 @@ +bin/libapt-pkg*.so.* usr/lib/@DEB_HOST_MULTIARCH@/ diff --git a/po/apt-all.pot b/po/apt-all.pot deleted file mode 100644 index 8e4d9d62b..000000000 --- a/po/apt-all.pot +++ /dev/null @@ -1,3260 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-10-30 13:46-0500\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"Language: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" - -#: cmdline/apt-cache.cc:158 -#, c-format -msgid "Package %s version %s has an unmet dep:\n" -msgstr "" - -#: cmdline/apt-cache.cc:286 -msgid "Total package names: " -msgstr "" - -#: cmdline/apt-cache.cc:288 -msgid "Total package structures: " -msgstr "" - -#: cmdline/apt-cache.cc:328 -msgid " Normal packages: " -msgstr "" - -#: cmdline/apt-cache.cc:329 -msgid " Pure virtual packages: " -msgstr "" - -#: cmdline/apt-cache.cc:330 -msgid " Single virtual packages: " -msgstr "" - -#: cmdline/apt-cache.cc:331 -msgid " Mixed virtual packages: " -msgstr "" - -#: cmdline/apt-cache.cc:332 -msgid " Missing: " -msgstr "" - -#: cmdline/apt-cache.cc:334 -msgid "Total distinct versions: " -msgstr "" - -#: cmdline/apt-cache.cc:336 -msgid "Total distinct descriptions: " -msgstr "" - -#: cmdline/apt-cache.cc:338 -msgid "Total dependencies: " -msgstr "" - -#: cmdline/apt-cache.cc:341 -msgid "Total ver/file relations: " -msgstr "" - -#: cmdline/apt-cache.cc:343 -msgid "Total Desc/File relations: " -msgstr "" - -#: cmdline/apt-cache.cc:345 -msgid "Total Provides mappings: " -msgstr "" - -#: cmdline/apt-cache.cc:357 -msgid "Total globbed strings: " -msgstr "" - -#: cmdline/apt-cache.cc:371 -msgid "Total dependency version space: " -msgstr "" - -#: cmdline/apt-cache.cc:376 -msgid "Total slack space: " -msgstr "" - -#: cmdline/apt-cache.cc:384 -msgid "Total space accounted for: " -msgstr "" - -#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1143 -#, c-format -msgid "Package file %s is out of sync." -msgstr "" - -#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1378 -#: cmdline/apt-cache.cc:1380 cmdline/apt-cache.cc:1457 cmdline/apt-mark.cc:39 -#: cmdline/apt-mark.cc:86 cmdline/apt-mark.cc:162 -msgid "No packages found" -msgstr "" - -#: cmdline/apt-cache.cc:1222 -msgid "You must give at least one search pattern" -msgstr "" - -#: cmdline/apt-cache.cc:1357 -msgid "This command is deprecated. Please use 'apt-mark showauto' instead." -msgstr "" - -#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:445 -#, c-format -msgid "Unable to locate package %s" -msgstr "" - -#: cmdline/apt-cache.cc:1482 -msgid "Package files:" -msgstr "" - -#: cmdline/apt-cache.cc:1489 cmdline/apt-cache.cc:1580 -msgid "Cache is out of sync, can't x-ref a package file" -msgstr "" - -#. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1503 -msgid "Pinned packages:" -msgstr "" - -#: cmdline/apt-cache.cc:1515 cmdline/apt-cache.cc:1560 -msgid "(not found)" -msgstr "" - -#: cmdline/apt-cache.cc:1523 -msgid " Installed: " -msgstr "" - -#: cmdline/apt-cache.cc:1524 -msgid " Candidate: " -msgstr "" - -#: cmdline/apt-cache.cc:1542 cmdline/apt-cache.cc:1550 -msgid "(none)" -msgstr "" - -#: cmdline/apt-cache.cc:1557 -msgid " Package pin: " -msgstr "" - -#. Show the priority tables -#: cmdline/apt-cache.cc:1566 -msgid " Version table:" -msgstr "" - -#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:199 cmdline/apt-config.cc:75 -#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:590 -#: cmdline/apt-get.cc:3244 cmdline/apt-internal-solver.cc:32 -#: cmdline/apt-mark.cc:266 cmdline/apt-sortpkgs.cc:147 -#, c-format -msgid "%s %s for %s compiled on %s %s\n" -msgstr "" - -#: cmdline/apt-cache.cc:1686 -msgid "" -"Usage: apt-cache [options] command\n" -" apt-cache [options] showpkg pkg1 [pkg2 ...]\n" -" apt-cache [options] showsrc pkg1 [pkg2 ...]\n" -"\n" -"apt-cache is a low-level tool used to query information\n" -"from APT's binary cache files\n" -"\n" -"Commands:\n" -" gencaches - Build both the package and source cache\n" -" showpkg - Show some general information for a single package\n" -" showsrc - Show source records\n" -" stats - Show some basic statistics\n" -" dump - Show the entire file in a terse form\n" -" dumpavail - Print an available file to stdout\n" -" unmet - Show unmet dependencies\n" -" search - Search the package list for a regex pattern\n" -" show - Show a readable record for the package\n" -" depends - Show raw dependency information for a package\n" -" rdepends - Show reverse dependency information for a package\n" -" pkgnames - List the names of all packages in the system\n" -" dotty - Generate package graphs for GraphViz\n" -" xvcg - Generate package graphs for xvcg\n" -" policy - Show policy settings\n" -"\n" -"Options:\n" -" -h This help text.\n" -" -p=? The package cache.\n" -" -s=? The source cache.\n" -" -q Disable progress indicator.\n" -" -i Show only important deps for the unmet command.\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -"See the apt-cache(8) and apt.conf(5) manual pages for more information.\n" -msgstr "" - -#: cmdline/apt-cdrom.cc:79 -msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" -msgstr "" - -#: cmdline/apt-cdrom.cc:94 -msgid "Please insert a Disc in the drive and press enter" -msgstr "" - -#: cmdline/apt-cdrom.cc:129 -#, c-format -msgid "Failed to mount '%s' to '%s'" -msgstr "" - -#: cmdline/apt-cdrom.cc:164 -msgid "Repeat this process for the rest of the CDs in your set." -msgstr "" - -#: cmdline/apt-config.cc:46 -msgid "Arguments not in pairs" -msgstr "" - -#: cmdline/apt-config.cc:81 -msgid "" -"Usage: apt-config [options] command\n" -"\n" -"apt-config is a simple tool to read the APT config file\n" -"\n" -"Commands:\n" -" shell - Shell mode\n" -" dump - Show the configuration\n" -"\n" -"Options:\n" -" -h This help text.\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" - -#: cmdline/apt-extracttemplates.cc:100 -#, c-format -msgid "%s not a valid DEB package." -msgstr "" - -#: cmdline/apt-extracttemplates.cc:234 -msgid "" -"Usage: apt-extracttemplates file1 [file2 ...]\n" -"\n" -"apt-extracttemplates is a tool to extract config and template info\n" -"from debian packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" -t Set the temp dir\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" - -#: cmdline/apt-extracttemplates.cc:269 apt-pkg/pkgcachegen.cc:1269 -#, c-format -msgid "Unable to write to %s" -msgstr "" - -#: cmdline/apt-extracttemplates.cc:311 -msgid "Cannot get debconf version. Is debconf installed?" -msgstr "" - -#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348 -msgid "Package extension list is too long" -msgstr "" - -#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 -#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:263 -#: ftparchive/apt-ftparchive.cc:277 ftparchive/apt-ftparchive.cc:299 -#, c-format -msgid "Error processing directory %s" -msgstr "" - -#: ftparchive/apt-ftparchive.cc:261 -msgid "Source extension list is too long" -msgstr "" - -#: ftparchive/apt-ftparchive.cc:378 -msgid "Error writing header to contents file" -msgstr "" - -#: ftparchive/apt-ftparchive.cc:408 -#, c-format -msgid "Error processing contents %s" -msgstr "" - -#: ftparchive/apt-ftparchive.cc:596 -msgid "" -"Usage: apt-ftparchive [options] command\n" -"Commands: packages binarypath [overridefile [pathprefix]]\n" -" sources srcpath [overridefile [pathprefix]]\n" -" contents path\n" -" release path\n" -" generate config [groups]\n" -" clean config\n" -"\n" -"apt-ftparchive generates index files for Debian archives. It supports\n" -"many styles of generation from fully automated to functional replacements\n" -"for dpkg-scanpackages and dpkg-scansources\n" -"\n" -"apt-ftparchive generates Package files from a tree of .debs. The\n" -"Package file contains the contents of all the control fields from\n" -"each package as well as the MD5 hash and filesize. An override file\n" -"is supported to force the value of Priority and Section.\n" -"\n" -"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" -"The --source-override option can be used to specify a src override file\n" -"\n" -"The 'packages' and 'sources' command should be run in the root of the\n" -"tree. BinaryPath should point to the base of the recursive search and \n" -"override file should contain the override flags. Pathprefix is\n" -"appended to the filename fields if present. Example usage from the \n" -"Debian archive:\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" --md5 Control MD5 generation\n" -" -s=? Source override file\n" -" -q Quiet\n" -" -d=? Select the optional caching database\n" -" --no-delink Enable delinking debug mode\n" -" --contents Control contents file generation\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option" -msgstr "" - -#: ftparchive/apt-ftparchive.cc:802 -msgid "No selections matched" -msgstr "" - -#: ftparchive/apt-ftparchive.cc:880 -#, c-format -msgid "Some files are missing in the package file group `%s'" -msgstr "" - -#: ftparchive/cachedb.cc:46 -#, c-format -msgid "DB was corrupted, file renamed to %s.old" -msgstr "" - -#: ftparchive/cachedb.cc:64 -#, c-format -msgid "DB is old, attempting to upgrade %s" -msgstr "" - -#: ftparchive/cachedb.cc:75 -msgid "" -"DB format is invalid. If you upgraded from an older version of apt, please " -"remove and re-create the database." -msgstr "" - -#: ftparchive/cachedb.cc:80 -#, c-format -msgid "Unable to open DB file %s: %s" -msgstr "" - -#: ftparchive/cachedb.cc:126 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 -#, c-format -msgid "Failed to stat %s" -msgstr "" - -#: ftparchive/cachedb.cc:248 -msgid "Archive has no control record" -msgstr "" - -#: ftparchive/cachedb.cc:489 -msgid "Unable to get a cursor" -msgstr "" - -#: ftparchive/writer.cc:80 -#, c-format -msgid "W: Unable to read directory %s\n" -msgstr "" - -#: ftparchive/writer.cc:85 -#, c-format -msgid "W: Unable to stat %s\n" -msgstr "" - -#: ftparchive/writer.cc:141 -msgid "E: " -msgstr "" - -#: ftparchive/writer.cc:143 -msgid "W: " -msgstr "" - -#: ftparchive/writer.cc:150 -msgid "E: Errors apply to file " -msgstr "" - -#: ftparchive/writer.cc:168 ftparchive/writer.cc:200 -#, c-format -msgid "Failed to resolve %s" -msgstr "" - -#: ftparchive/writer.cc:181 -msgid "Tree walking failed" -msgstr "" - -#: ftparchive/writer.cc:208 -#, c-format -msgid "Failed to open %s" -msgstr "" - -#: ftparchive/writer.cc:267 -#, c-format -msgid " DeLink %s [%s]\n" -msgstr "" - -#: ftparchive/writer.cc:275 -#, c-format -msgid "Failed to readlink %s" -msgstr "" - -#: ftparchive/writer.cc:279 -#, c-format -msgid "Failed to unlink %s" -msgstr "" - -#: ftparchive/writer.cc:286 -#, c-format -msgid "*** Failed to link %s to %s" -msgstr "" - -#: ftparchive/writer.cc:296 -#, c-format -msgid " DeLink limit of %sB hit.\n" -msgstr "" - -#: ftparchive/writer.cc:401 -msgid "Archive had no package field" -msgstr "" - -#: ftparchive/writer.cc:409 ftparchive/writer.cc:711 -#, c-format -msgid " %s has no override entry\n" -msgstr "" - -#: ftparchive/writer.cc:477 ftparchive/writer.cc:827 -#, c-format -msgid " %s maintainer is %s not %s\n" -msgstr "" - -#: ftparchive/writer.cc:721 -#, c-format -msgid " %s has no source override entry\n" -msgstr "" - -#: ftparchive/writer.cc:725 -#, c-format -msgid " %s has no binary override entry either\n" -msgstr "" - -#: ftparchive/contents.cc:339 ftparchive/contents.cc:370 -msgid "realloc - Failed to allocate memory" -msgstr "" - -#: ftparchive/override.cc:34 ftparchive/override.cc:142 -#, c-format -msgid "Unable to open %s" -msgstr "" - -#: ftparchive/override.cc:60 ftparchive/override.cc:166 -#, c-format -msgid "Malformed override %s line %llu #1" -msgstr "" - -#: ftparchive/override.cc:74 ftparchive/override.cc:178 -#, c-format -msgid "Malformed override %s line %llu #2" -msgstr "" - -#: ftparchive/override.cc:88 ftparchive/override.cc:191 -#, c-format -msgid "Malformed override %s line %llu #3" -msgstr "" - -#: ftparchive/override.cc:127 ftparchive/override.cc:201 -#, c-format -msgid "Failed to read the override file %s" -msgstr "" - -#: ftparchive/multicompress.cc:69 -#, c-format -msgid "Unknown compression algorithm '%s'" -msgstr "" - -#: ftparchive/multicompress.cc:99 -#, c-format -msgid "Compressed output %s needs a compression set" -msgstr "" - -#: ftparchive/multicompress.cc:167 methods/rsh.cc:97 -msgid "Failed to create IPC pipe to subprocess" -msgstr "" - -#: ftparchive/multicompress.cc:193 -msgid "Failed to create FILE*" -msgstr "" - -#: ftparchive/multicompress.cc:196 -msgid "Failed to fork" -msgstr "" - -#: ftparchive/multicompress.cc:210 -msgid "Compress child" -msgstr "" - -#: ftparchive/multicompress.cc:233 -#, c-format -msgid "Internal error, failed to create %s" -msgstr "" - -#: ftparchive/multicompress.cc:284 -msgid "Failed to create subprocess IPC" -msgstr "" - -#: ftparchive/multicompress.cc:321 -msgid "Failed to exec compressor " -msgstr "" - -#: ftparchive/multicompress.cc:360 -msgid "decompressor" -msgstr "" - -#: ftparchive/multicompress.cc:403 -msgid "IO to subprocess/file failed" -msgstr "" - -#: ftparchive/multicompress.cc:455 -msgid "Failed to read while computing MD5" -msgstr "" - -#: ftparchive/multicompress.cc:472 -#, c-format -msgid "Problem unlinking %s" -msgstr "" - -#: ftparchive/multicompress.cc:487 apt-inst/extract.cc:188 -#, c-format -msgid "Failed to rename %s to %s" -msgstr "" - -#: cmdline/apt-get.cc:135 -msgid "Y" -msgstr "" - -#: cmdline/apt-get.cc:140 -msgid "N" -msgstr "" - -#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31 -#, c-format -msgid "Regex compilation error - %s" -msgstr "" - -#: cmdline/apt-get.cc:257 -msgid "The following packages have unmet dependencies:" -msgstr "" - -#: cmdline/apt-get.cc:347 -#, c-format -msgid "but %s is installed" -msgstr "" - -#: cmdline/apt-get.cc:349 -#, c-format -msgid "but %s is to be installed" -msgstr "" - -#: cmdline/apt-get.cc:356 -msgid "but it is not installable" -msgstr "" - -#: cmdline/apt-get.cc:358 -msgid "but it is a virtual package" -msgstr "" - -#: cmdline/apt-get.cc:361 -msgid "but it is not installed" -msgstr "" - -#: cmdline/apt-get.cc:361 -msgid "but it is not going to be installed" -msgstr "" - -#: cmdline/apt-get.cc:366 -msgid " or" -msgstr "" - -#: cmdline/apt-get.cc:395 -msgid "The following NEW packages will be installed:" -msgstr "" - -#: cmdline/apt-get.cc:421 -msgid "The following packages will be REMOVED:" -msgstr "" - -#: cmdline/apt-get.cc:443 -msgid "The following packages have been kept back:" -msgstr "" - -#: cmdline/apt-get.cc:464 -msgid "The following packages will be upgraded:" -msgstr "" - -#: cmdline/apt-get.cc:485 -msgid "The following packages will be DOWNGRADED:" -msgstr "" - -#: cmdline/apt-get.cc:505 -msgid "The following held packages will be changed:" -msgstr "" - -#: cmdline/apt-get.cc:560 -#, c-format -msgid "%s (due to %s) " -msgstr "" - -#: cmdline/apt-get.cc:568 -msgid "" -"WARNING: The following essential packages will be removed.\n" -"This should NOT be done unless you know exactly what you are doing!" -msgstr "" - -#: cmdline/apt-get.cc:599 -#, c-format -msgid "%lu upgraded, %lu newly installed, " -msgstr "" - -#: cmdline/apt-get.cc:603 -#, c-format -msgid "%lu reinstalled, " -msgstr "" - -#: cmdline/apt-get.cc:605 -#, c-format -msgid "%lu downgraded, " -msgstr "" - -#: cmdline/apt-get.cc:607 -#, c-format -msgid "%lu to remove and %lu not upgraded.\n" -msgstr "" - -#: cmdline/apt-get.cc:611 -#, c-format -msgid "%lu not fully installed or removed.\n" -msgstr "" - -#: cmdline/apt-get.cc:633 -#, c-format -msgid "Note, selecting '%s' for task '%s'\n" -msgstr "" - -#: cmdline/apt-get.cc:639 -#, c-format -msgid "Note, selecting '%s' for regex '%s'\n" -msgstr "" - -#: cmdline/apt-get.cc:656 -#, c-format -msgid "Package %s is a virtual package provided by:\n" -msgstr "" - -#: cmdline/apt-get.cc:667 -msgid " [Installed]" -msgstr "" - -#: cmdline/apt-get.cc:676 -msgid " [Not candidate version]" -msgstr "" - -#: cmdline/apt-get.cc:678 -msgid "You should explicitly select one to install." -msgstr "" - -#: cmdline/apt-get.cc:681 -#, c-format -msgid "" -"Package %s is not available, but is referred to by another package.\n" -"This may mean that the package is missing, has been obsoleted, or\n" -"is only available from another source\n" -msgstr "" - -#: cmdline/apt-get.cc:699 -msgid "However the following packages replace it:" -msgstr "" - -#: cmdline/apt-get.cc:711 -#, c-format -msgid "Package '%s' has no installation candidate" -msgstr "" - -#: cmdline/apt-get.cc:722 -#, c-format -msgid "Virtual packages like '%s' can't be removed\n" -msgstr "" - -#: cmdline/apt-get.cc:753 -#, c-format -msgid "Note, selecting '%s' instead of '%s'\n" -msgstr "" - -#: cmdline/apt-get.cc:783 -#, c-format -msgid "Skipping %s, it is already installed and upgrade is not set.\n" -msgstr "" - -#: cmdline/apt-get.cc:787 -#, c-format -msgid "Skipping %s, it is not installed and only upgrades are requested.\n" -msgstr "" - -#: cmdline/apt-get.cc:799 -#, c-format -msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" -msgstr "" - -#: cmdline/apt-get.cc:804 -#, c-format -msgid "%s is already the newest version.\n" -msgstr "" - -#: cmdline/apt-get.cc:823 cmdline/apt-get.cc:2103 cmdline/apt-mark.cc:61 -#, c-format -msgid "%s set to manually installed.\n" -msgstr "" - -#: cmdline/apt-get.cc:849 -#, c-format -msgid "Selected version '%s' (%s) for '%s'\n" -msgstr "" - -#: cmdline/apt-get.cc:854 -#, c-format -msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" -msgstr "" - -#: cmdline/apt-get.cc:896 -#, c-format -msgid "Package %s is not installed, so not removed\n" -msgstr "" - -#: cmdline/apt-get.cc:974 -msgid "Correcting dependencies..." -msgstr "" - -#: cmdline/apt-get.cc:977 -msgid " failed." -msgstr "" - -#: cmdline/apt-get.cc:980 -msgid "Unable to correct dependencies" -msgstr "" - -#: cmdline/apt-get.cc:983 -msgid "Unable to minimize the upgrade set" -msgstr "" - -#: cmdline/apt-get.cc:985 -msgid " Done" -msgstr "" - -#: cmdline/apt-get.cc:989 -msgid "You might want to run 'apt-get -f install' to correct these." -msgstr "" - -#: cmdline/apt-get.cc:992 -msgid "Unmet dependencies. Try using -f." -msgstr "" - -#: cmdline/apt-get.cc:1017 -msgid "WARNING: The following packages cannot be authenticated!" -msgstr "" - -#: cmdline/apt-get.cc:1021 -msgid "Authentication warning overridden.\n" -msgstr "" - -#: cmdline/apt-get.cc:1028 -msgid "Install these packages without verification [y/N]? " -msgstr "" - -#: cmdline/apt-get.cc:1030 -msgid "Some packages could not be authenticated" -msgstr "" - -#: cmdline/apt-get.cc:1039 cmdline/apt-get.cc:1200 -msgid "There are problems and -y was used without --force-yes" -msgstr "" - -#: cmdline/apt-get.cc:1080 -msgid "Internal error, InstallPackages was called with broken packages!" -msgstr "" - -#: cmdline/apt-get.cc:1089 -msgid "Packages need to be removed but remove is disabled." -msgstr "" - -#: cmdline/apt-get.cc:1100 -msgid "Internal error, Ordering didn't finish" -msgstr "" - -#: cmdline/apt-get.cc:1138 -msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" -msgstr "" - -#. TRANSLATOR: The required space between number and unit is already included -#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1145 -#, c-format -msgid "Need to get %sB/%sB of archives.\n" -msgstr "" - -#. TRANSLATOR: The required space between number and unit is already included -#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1150 -#, c-format -msgid "Need to get %sB of archives.\n" -msgstr "" - -#. TRANSLATOR: The required space between number and unit is already included -#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1157 -#, c-format -msgid "After this operation, %sB of additional disk space will be used.\n" -msgstr "" - -#. TRANSLATOR: The required space between number and unit is already included -#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1162 -#, c-format -msgid "After this operation, %sB disk space will be freed.\n" -msgstr "" - -#: cmdline/apt-get.cc:1177 cmdline/apt-get.cc:1180 cmdline/apt-get.cc:2523 -#: cmdline/apt-get.cc:2526 -#, c-format -msgid "Couldn't determine free space in %s" -msgstr "" - -#: cmdline/apt-get.cc:1190 -#, c-format -msgid "You don't have enough free space in %s." -msgstr "" - -#: cmdline/apt-get.cc:1206 cmdline/apt-get.cc:1226 -msgid "Trivial Only specified but this is not a trivial operation." -msgstr "" - -#: cmdline/apt-get.cc:1208 -msgid "Yes, do as I say!" -msgstr "" - -#: cmdline/apt-get.cc:1210 -#, c-format -msgid "" -"You are about to do something potentially harmful.\n" -"To continue type in the phrase '%s'\n" -" ?] " -msgstr "" - -#: cmdline/apt-get.cc:1216 cmdline/apt-get.cc:1235 -msgid "Abort." -msgstr "" - -#: cmdline/apt-get.cc:1231 -msgid "Do you want to continue [Y/n]? " -msgstr "" - -#: cmdline/apt-get.cc:1303 cmdline/apt-get.cc:2588 apt-pkg/algorithms.cc:1492 -#, c-format -msgid "Failed to fetch %s %s\n" -msgstr "" - -#: cmdline/apt-get.cc:1321 -msgid "Some files failed to download" -msgstr "" - -#: cmdline/apt-get.cc:1322 cmdline/apt-get.cc:2600 -msgid "Download complete and in download only mode" -msgstr "" - -#: cmdline/apt-get.cc:1328 -msgid "" -"Unable to fetch some archives, maybe run apt-get update or try with --fix-" -"missing?" -msgstr "" - -#: cmdline/apt-get.cc:1332 -msgid "--fix-missing and media swapping is not currently supported" -msgstr "" - -#: cmdline/apt-get.cc:1337 -msgid "Unable to correct missing packages." -msgstr "" - -#: cmdline/apt-get.cc:1338 -msgid "Aborting install." -msgstr "" - -#: cmdline/apt-get.cc:1366 -msgid "" -"The following package disappeared from your system as\n" -"all files have been overwritten by other packages:" -msgid_plural "" -"The following packages disappeared from your system as\n" -"all files have been overwritten by other packages:" -msgstr[0] "" -msgstr[1] "" - -#: cmdline/apt-get.cc:1370 -msgid "Note: This is done automatic and on purpose by dpkg." -msgstr "" - -#: cmdline/apt-get.cc:1508 -#, c-format -msgid "Ignore unavailable target release '%s' of package '%s'" -msgstr "" - -#: cmdline/apt-get.cc:1540 -#, c-format -msgid "Picking '%s' as source package instead of '%s'\n" -msgstr "" - -#. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1578 -#, c-format -msgid "Ignore unavailable version '%s' of package '%s'" -msgstr "" - -#: cmdline/apt-get.cc:1594 -msgid "The update command takes no arguments" -msgstr "" - -#: cmdline/apt-get.cc:1657 -msgid "We are not supposed to delete stuff, can't start AutoRemover" -msgstr "" - -#: cmdline/apt-get.cc:1761 -msgid "" -"Hmm, seems like the AutoRemover destroyed something which really\n" -"shouldn't happen. Please file a bug report against apt." -msgstr "" - -#. -#. if (Packages == 1) -#. { -#. c1out << endl; -#. c1out << -#. _("Since you only requested a single operation it is extremely likely that\n" -#. "the package is simply not installable and a bug report against\n" -#. "that package should be filed.") << endl; -#. } -#. -#: cmdline/apt-get.cc:1764 cmdline/apt-get.cc:1933 -msgid "The following information may help to resolve the situation:" -msgstr "" - -#: cmdline/apt-get.cc:1768 -msgid "Internal Error, AutoRemover broke stuff" -msgstr "" - -#: cmdline/apt-get.cc:1775 -msgid "" -"The following package was automatically installed and is no longer required:" -msgid_plural "" -"The following packages were automatically installed and are no longer " -"required:" -msgstr[0] "" -msgstr[1] "" - -#: cmdline/apt-get.cc:1779 -#, c-format -msgid "%lu package was automatically installed and is no longer required.\n" -msgid_plural "" -"%lu packages were automatically installed and are no longer required.\n" -msgstr[0] "" -msgstr[1] "" - -#: cmdline/apt-get.cc:1781 -msgid "Use 'apt-get autoremove' to remove them." -msgstr "" - -#: cmdline/apt-get.cc:1800 -msgid "Internal error, AllUpgrade broke stuff" -msgstr "" - -#: cmdline/apt-get.cc:1899 -msgid "You might want to run 'apt-get -f install' to correct these:" -msgstr "" - -#: cmdline/apt-get.cc:1903 -msgid "" -"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " -"solution)." -msgstr "" - -#: cmdline/apt-get.cc:1918 -msgid "" -"Some packages could not be installed. This may mean that you have\n" -"requested an impossible situation or if you are using the unstable\n" -"distribution that some required packages have not yet been created\n" -"or been moved out of Incoming." -msgstr "" - -#: cmdline/apt-get.cc:1939 -msgid "Broken packages" -msgstr "" - -#: cmdline/apt-get.cc:1965 -msgid "The following extra packages will be installed:" -msgstr "" - -#: cmdline/apt-get.cc:2055 -msgid "Suggested packages:" -msgstr "" - -#: cmdline/apt-get.cc:2056 -msgid "Recommended packages:" -msgstr "" - -#: cmdline/apt-get.cc:2098 -#, c-format -msgid "Couldn't find package %s" -msgstr "" - -#: cmdline/apt-get.cc:2105 cmdline/apt-mark.cc:63 -#, c-format -msgid "%s set to automatically installed.\n" -msgstr "" - -#: cmdline/apt-get.cc:2113 cmdline/apt-mark.cc:107 -msgid "" -"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " -"instead." -msgstr "" - -#: cmdline/apt-get.cc:2129 -msgid "Calculating upgrade... " -msgstr "" - -#: cmdline/apt-get.cc:2132 methods/ftp.cc:711 methods/connect.cc:115 -msgid "Failed" -msgstr "" - -#: cmdline/apt-get.cc:2137 -msgid "Done" -msgstr "" - -#: cmdline/apt-get.cc:2204 cmdline/apt-get.cc:2212 -msgid "Internal error, problem resolver broke stuff" -msgstr "" - -#: cmdline/apt-get.cc:2240 cmdline/apt-get.cc:2276 -msgid "Unable to lock the download directory" -msgstr "" - -#: cmdline/apt-get.cc:2327 -#, c-format -msgid "Downloading %s %s" -msgstr "" - -#: cmdline/apt-get.cc:2385 -msgid "Must specify at least one package to fetch source for" -msgstr "" - -#: cmdline/apt-get.cc:2425 cmdline/apt-get.cc:2737 -#, c-format -msgid "Unable to find a source package for %s" -msgstr "" - -#: cmdline/apt-get.cc:2442 -#, c-format -msgid "" -"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" -"%s\n" -msgstr "" - -#: cmdline/apt-get.cc:2447 -#, c-format -msgid "" -"Please use:\n" -"bzr get %s\n" -"to retrieve the latest (possibly unreleased) updates to the package.\n" -msgstr "" - -#: cmdline/apt-get.cc:2500 -#, c-format -msgid "Skipping already downloaded file '%s'\n" -msgstr "" - -#: cmdline/apt-get.cc:2537 -#, c-format -msgid "You don't have enough free space in %s" -msgstr "" - -#. TRANSLATOR: The required space between number and unit is already included -#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2546 -#, c-format -msgid "Need to get %sB/%sB of source archives.\n" -msgstr "" - -#. TRANSLATOR: The required space between number and unit is already included -#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2551 -#, c-format -msgid "Need to get %sB of source archives.\n" -msgstr "" - -#: cmdline/apt-get.cc:2557 -#, c-format -msgid "Fetch source %s\n" -msgstr "" - -#: cmdline/apt-get.cc:2595 -msgid "Failed to fetch some archives." -msgstr "" - -#: cmdline/apt-get.cc:2626 -#, c-format -msgid "Skipping unpack of already unpacked source in %s\n" -msgstr "" - -#: cmdline/apt-get.cc:2638 -#, c-format -msgid "Unpack command '%s' failed.\n" -msgstr "" - -#: cmdline/apt-get.cc:2639 -#, c-format -msgid "Check if the 'dpkg-dev' package is installed.\n" -msgstr "" - -#: cmdline/apt-get.cc:2661 -#, c-format -msgid "Build command '%s' failed.\n" -msgstr "" - -#: cmdline/apt-get.cc:2681 -msgid "Child process failed" -msgstr "" - -#: cmdline/apt-get.cc:2700 -msgid "Must specify at least one package to check builddeps for" -msgstr "" - -#: cmdline/apt-get.cc:2725 -#, c-format -msgid "" -"No architecture information available for %s. See apt.conf(5) APT::" -"Architectures for setup" -msgstr "" - -#: cmdline/apt-get.cc:2742 -#, c-format -msgid "Unable to get build-dependency information for %s" -msgstr "" - -#: cmdline/apt-get.cc:2762 -#, c-format -msgid "%s has no build depends.\n" -msgstr "" - -#: cmdline/apt-get.cc:2892 -#, c-format -msgid "" -"%s dependency for %s can't be satisfied because %s is not allowed on '%s' " -"packages" -msgstr "" - -#: cmdline/apt-get.cc:2913 -#, c-format -msgid "" -"%s dependency for %s cannot be satisfied because the package %s cannot be " -"found" -msgstr "" - -#: cmdline/apt-get.cc:2936 -#, c-format -msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" -msgstr "" - -#: cmdline/apt-get.cc:2975 -#, c-format -msgid "" -"%s dependency for %s cannot be satisfied because candidate version of " -"package %s can't satisfy version requirements" -msgstr "" - -#: cmdline/apt-get.cc:2981 -#, c-format -msgid "" -"%s dependency for %s cannot be satisfied because package %s has no candidate " -"version" -msgstr "" - -#: cmdline/apt-get.cc:3004 -#, c-format -msgid "Failed to satisfy %s dependency for %s: %s" -msgstr "" - -#: cmdline/apt-get.cc:3020 -#, c-format -msgid "Build-dependencies for %s could not be satisfied." -msgstr "" - -#: cmdline/apt-get.cc:3025 -msgid "Failed to process build dependencies" -msgstr "" - -#: cmdline/apt-get.cc:3118 cmdline/apt-get.cc:3130 -#, c-format -msgid "Changelog for %s (%s)" -msgstr "" - -#: cmdline/apt-get.cc:3249 -msgid "Supported modules:" -msgstr "" - -#: cmdline/apt-get.cc:3290 -msgid "" -"Usage: apt-get [options] command\n" -" apt-get [options] install|remove pkg1 [pkg2 ...]\n" -" apt-get [options] source pkg1 [pkg2 ...]\n" -"\n" -"apt-get is a simple command line interface for downloading and\n" -"installing packages. The most frequently used commands are update\n" -"and install.\n" -"\n" -"Commands:\n" -" update - Retrieve new lists of packages\n" -" upgrade - Perform an upgrade\n" -" install - Install new packages (pkg is libc6 not libc6.deb)\n" -" remove - Remove packages\n" -" autoremove - Remove automatically all unused packages\n" -" purge - Remove packages and config files\n" -" source - Download source archives\n" -" build-dep - Configure build-dependencies for source packages\n" -" dist-upgrade - Distribution upgrade, see apt-get(8)\n" -" dselect-upgrade - Follow dselect selections\n" -" clean - Erase downloaded archive files\n" -" autoclean - Erase old downloaded archive files\n" -" check - Verify that there are no broken dependencies\n" -" changelog - Download and display the changelog for the given package\n" -" download - Download the binary package into the current directory\n" -"\n" -"Options:\n" -" -h This help text.\n" -" -q Loggable output - no progress indicator\n" -" -qq No output except for errors\n" -" -d Download only - do NOT install or unpack archives\n" -" -s No-act. Perform ordering simulation\n" -" -y Assume Yes to all queries and do not prompt\n" -" -f Attempt to correct a system with broken dependencies in place\n" -" -m Attempt to continue if archives are unlocatable\n" -" -u Show a list of upgraded packages as well\n" -" -b Build the source package after fetching it\n" -" -V Show verbose version numbers\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -"See the apt-get(8), sources.list(5) and apt.conf(5) manual\n" -"pages for more information and options.\n" -" This APT has Super Cow Powers.\n" -msgstr "" - -#: cmdline/apt-get.cc:3455 -msgid "" -"NOTE: This is only a simulation!\n" -" apt-get needs root privileges for real execution.\n" -" Keep also in mind that locking is deactivated,\n" -" so don't depend on the relevance to the real current situation!" -msgstr "" - -#: cmdline/acqprogress.cc:59 -msgid "Hit " -msgstr "" - -#: cmdline/acqprogress.cc:83 -msgid "Get:" -msgstr "" - -#: cmdline/acqprogress.cc:114 -msgid "Ign " -msgstr "" - -#: cmdline/acqprogress.cc:118 -msgid "Err " -msgstr "" - -#: cmdline/acqprogress.cc:139 -#, c-format -msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "" - -#: cmdline/acqprogress.cc:229 -#, c-format -msgid " [Working]" -msgstr "" - -#: cmdline/acqprogress.cc:285 -#, c-format -msgid "" -"Media change: please insert the disc labeled\n" -" '%s'\n" -"in the drive '%s' and press enter\n" -msgstr "" - -#: cmdline/apt-internal-solver.cc:36 -msgid "" -"Usage: apt-internal-resolver\n" -"\n" -"apt-internal-resolver is an interface to use the current internal\n" -"like an external resolver for the APT family for debugging or alike\n" -"\n" -"Options:\n" -" -h This help text.\n" -" -q Loggable output - no progress indicator\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -"apt.conf(5) manual pages for more information and options.\n" -" This APT has Super Cow Powers.\n" -msgstr "" - -#: cmdline/apt-mark.cc:48 -#, c-format -msgid "%s can not be marked as it is not installed.\n" -msgstr "" - -#: cmdline/apt-mark.cc:54 -#, c-format -msgid "%s was already set to manually installed.\n" -msgstr "" - -#: cmdline/apt-mark.cc:56 -#, c-format -msgid "%s was already set to automatically installed.\n" -msgstr "" - -#: cmdline/apt-mark.cc:171 -#, c-format -msgid "%s was already set on hold.\n" -msgstr "" - -#: cmdline/apt-mark.cc:173 -#, c-format -msgid "%s was already not hold.\n" -msgstr "" - -#: cmdline/apt-mark.cc:187 cmdline/apt-mark.cc:209 -#, c-format -msgid "%s set on hold.\n" -msgstr "" - -#: cmdline/apt-mark.cc:189 cmdline/apt-mark.cc:214 -#, c-format -msgid "Canceled hold on %s.\n" -msgstr "" - -#: cmdline/apt-mark.cc:222 -msgid "Executing dpkg failed. Are you root?" -msgstr "" - -#: cmdline/apt-mark.cc:270 -msgid "" -"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" -"\n" -"apt-mark is a simple command line interface for marking packages\n" -"as manual or automatical installed. It can also list marks.\n" -"\n" -"Commands:\n" -" auto - Mark the given packages as automatically installed\n" -" manual - Mark the given packages as manually installed\n" -"\n" -"Options:\n" -" -h This help text.\n" -" -q Loggable output - no progress indicator\n" -" -qq No output except for errors\n" -" -s No-act. Just prints what would be done.\n" -" -f read/write auto/manual marking in the given file\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -"See the apt-mark(8) and apt.conf(5) manual pages for more information." -msgstr "" - -#: cmdline/apt-sortpkgs.cc:89 -msgid "Unknown package record!" -msgstr "" - -#: cmdline/apt-sortpkgs.cc:153 -msgid "" -"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" -"\n" -"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" -"to indicate what kind of file it is.\n" -"\n" -"Options:\n" -" -h This help text\n" -" -s Use source file sorting\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" - -#: dselect/install:32 -msgid "Bad default setting!" -msgstr "" - -#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94 -#: dselect/install:105 dselect/update:45 -msgid "Press enter to continue." -msgstr "" - -#: dselect/install:91 -msgid "Do you want to erase any previously downloaded .deb files?" -msgstr "" - -#: dselect/install:101 -msgid "Some errors occurred while unpacking. Packages that were installed" -msgstr "" - -#: dselect/install:102 -msgid "will be configured. This may result in duplicate errors" -msgstr "" - -#: dselect/install:103 -msgid "or errors caused by missing dependencies. This is OK, only the errors" -msgstr "" - -#: dselect/install:104 -msgid "" -"above this message are important. Please fix them and run [I]nstall again" -msgstr "" - -#: dselect/update:30 -msgid "Merging available information" -msgstr "" - -#: apt-inst/contrib/extracttar.cc:117 -msgid "Failed to create pipes" -msgstr "" - -#: apt-inst/contrib/extracttar.cc:144 -msgid "Failed to exec gzip " -msgstr "" - -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211 -msgid "Corrupted archive" -msgstr "" - -#: apt-inst/contrib/extracttar.cc:196 -msgid "Tar checksum failed, archive corrupted" -msgstr "" - -#: apt-inst/contrib/extracttar.cc:303 -#, c-format -msgid "Unknown TAR header type %u, member %s" -msgstr "" - -#: apt-inst/contrib/arfile.cc:74 -msgid "Invalid archive signature" -msgstr "" - -#: apt-inst/contrib/arfile.cc:82 -msgid "Error reading archive member header" -msgstr "" - -#: apt-inst/contrib/arfile.cc:94 -#, c-format -msgid "Invalid archive member header %s" -msgstr "" - -#: apt-inst/contrib/arfile.cc:106 -msgid "Invalid archive member header" -msgstr "" - -#: apt-inst/contrib/arfile.cc:132 -msgid "Archive is too short" -msgstr "" - -#: apt-inst/contrib/arfile.cc:136 -msgid "Failed to read the archive headers" -msgstr "" - -#: apt-inst/filelist.cc:382 -msgid "DropNode called on still linked node" -msgstr "" - -#: apt-inst/filelist.cc:414 -msgid "Failed to locate the hash element!" -msgstr "" - -#: apt-inst/filelist.cc:461 -msgid "Failed to allocate diversion" -msgstr "" - -#: apt-inst/filelist.cc:466 -msgid "Internal error in AddDiversion" -msgstr "" - -#: apt-inst/filelist.cc:479 -#, c-format -msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" -msgstr "" - -#: apt-inst/filelist.cc:508 -#, c-format -msgid "Double add of diversion %s -> %s" -msgstr "" - -#: apt-inst/filelist.cc:551 -#, c-format -msgid "Duplicate conf file %s/%s" -msgstr "" - -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:55 -#, c-format -msgid "Failed to write file %s" -msgstr "" - -#: apt-inst/dirstream.cc:100 apt-inst/dirstream.cc:108 -#, c-format -msgid "Failed to close file %s" -msgstr "" - -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 -#, c-format -msgid "The path %s is too long" -msgstr "" - -#: apt-inst/extract.cc:127 -#, c-format -msgid "Unpacking %s more than once" -msgstr "" - -#: apt-inst/extract.cc:137 -#, c-format -msgid "The directory %s is diverted" -msgstr "" - -#: apt-inst/extract.cc:147 -#, c-format -msgid "The package is trying to write to the diversion target %s/%s" -msgstr "" - -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 -msgid "The diversion path is too long" -msgstr "" - -#: apt-inst/extract.cc:243 -#, c-format -msgid "The directory %s is being replaced by a non-directory" -msgstr "" - -#: apt-inst/extract.cc:283 -msgid "Failed to locate node in its hash bucket" -msgstr "" - -#: apt-inst/extract.cc:287 -msgid "The path is too long" -msgstr "" - -#: apt-inst/extract.cc:415 -#, c-format -msgid "Overwrite package match with no version for %s" -msgstr "" - -#: apt-inst/extract.cc:432 -#, c-format -msgid "File %s/%s overwrites the one in the package %s" -msgstr "" - -#. Only warn if there are no sources.list.d. -#. Only warn if there is no sources.list file. -#: apt-inst/extract.cc:465 apt-pkg/contrib/cdromutl.cc:183 -#: apt-pkg/contrib/fileutl.cc:344 apt-pkg/sourcelist.cc:208 -#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:456 apt-pkg/init.cc:108 -#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359 -#: methods/mirror.cc:95 -#, c-format -msgid "Unable to read %s" -msgstr "" - -#: apt-inst/extract.cc:492 -#, c-format -msgid "Unable to stat %s" -msgstr "" - -#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 -#, c-format -msgid "Failed to remove %s" -msgstr "" - -#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 -#, c-format -msgid "Unable to create %s" -msgstr "" - -#: apt-inst/deb/dpkgdb.cc:118 -#, c-format -msgid "Failed to stat %sinfo" -msgstr "" - -#: apt-inst/deb/dpkgdb.cc:123 -msgid "The info and temp directories need to be on the same filesystem" -msgstr "" - -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:1168 -#: apt-pkg/pkgcachegen.cc:1272 apt-pkg/pkgcachegen.cc:1278 -#: apt-pkg/pkgcachegen.cc:1434 -msgid "Reading package lists" -msgstr "" - -#: apt-inst/deb/dpkgdb.cc:180 -#, c-format -msgid "Failed to change to the admin dir %sinfo" -msgstr "" - -#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 -#: apt-inst/deb/dpkgdb.cc:448 -msgid "Internal error getting a package name" -msgstr "" - -#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 -msgid "Reading file listing" -msgstr "" - -#: apt-inst/deb/dpkgdb.cc:216 -#, c-format -msgid "" -"Failed to open the list file '%sinfo/%s'. If you cannot restore this file " -"then make it empty and immediately re-install the same version of the " -"package!" -msgstr "" - -#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 -#, c-format -msgid "Failed reading the list file %sinfo/%s" -msgstr "" - -#: apt-inst/deb/dpkgdb.cc:266 -msgid "Internal error getting a node" -msgstr "" - -#: apt-inst/deb/dpkgdb.cc:309 -#, c-format -msgid "Failed to open the diversions file %sdiversions" -msgstr "" - -#: apt-inst/deb/dpkgdb.cc:324 -msgid "The diversion file is corrupted" -msgstr "" - -#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 -#: apt-inst/deb/dpkgdb.cc:341 -#, c-format -msgid "Invalid line in the diversion file: %s" -msgstr "" - -#: apt-inst/deb/dpkgdb.cc:362 -msgid "Internal error adding a diversion" -msgstr "" - -#: apt-inst/deb/dpkgdb.cc:383 -msgid "The pkg cache must be initialized first" -msgstr "" - -#: apt-inst/deb/dpkgdb.cc:443 -#, c-format -msgid "Failed to find a Package: header, offset %lu" -msgstr "" - -#: apt-inst/deb/dpkgdb.cc:465 -#, c-format -msgid "Bad ConfFile section in the status file. Offset %lu" -msgstr "" - -#: apt-inst/deb/dpkgdb.cc:470 -#, c-format -msgid "Error parsing MD5. Offset %lu" -msgstr "" - -#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 -#, c-format -msgid "This is not a valid DEB archive, missing '%s' member" -msgstr "" - -#. FIXME: add data.tar.xz here - adding it now would require a Translation round for a very small gain -#: apt-inst/deb/debfile.cc:56 -#, c-format -msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member" -msgstr "" - -#: apt-inst/deb/debfile.cc:116 -#, c-format -msgid "Couldn't change to %s" -msgstr "" - -#: apt-inst/deb/debfile.cc:157 -#, c-format -msgid "Internal error, could not locate member %s" -msgstr "" - -#: apt-inst/deb/debfile.cc:192 -msgid "Failed to locate a valid control file" -msgstr "" - -#: apt-inst/deb/debfile.cc:277 -msgid "Unparsable control file" -msgstr "" - -#: methods/bzip2.cc:63 methods/gzip.cc:54 -msgid "Empty files can't be valid archives" -msgstr "" - -#: methods/bzip2.cc:67 -#, c-format -msgid "Couldn't open pipe for %s" -msgstr "" - -#: methods/bzip2.cc:111 -#, c-format -msgid "Read error from %s process" -msgstr "" - -#: methods/bzip2.cc:143 methods/bzip2.cc:152 methods/copy.cc:46 -#: methods/gzip.cc:94 methods/gzip.cc:103 methods/rred.cc:530 -#: methods/rred.cc:539 -msgid "Failed to stat" -msgstr "" - -#: methods/bzip2.cc:149 methods/copy.cc:83 methods/gzip.cc:100 -#: methods/rred.cc:536 -msgid "Failed to set modification time" -msgstr "" - -#: methods/cdrom.cc:203 -#, c-format -msgid "Unable to read the cdrom database %s" -msgstr "" - -#: methods/cdrom.cc:212 -msgid "" -"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update " -"cannot be used to add new CD-ROMs" -msgstr "" - -#: methods/cdrom.cc:222 -msgid "Wrong CD-ROM" -msgstr "" - -#: methods/cdrom.cc:249 -#, c-format -msgid "Unable to unmount the CD-ROM in %s, it may still be in use." -msgstr "" - -#: methods/cdrom.cc:254 -msgid "Disk not found." -msgstr "" - -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:271 -msgid "File not found" -msgstr "" - -#: methods/file.cc:47 -msgid "Invalid URI, local URIS must not start with //" -msgstr "" - -#. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:172 -msgid "Logging in" -msgstr "" - -#: methods/ftp.cc:178 -msgid "Unable to determine the peer name" -msgstr "" - -#: methods/ftp.cc:183 -msgid "Unable to determine the local name" -msgstr "" - -#: methods/ftp.cc:214 methods/ftp.cc:242 -#, c-format -msgid "The server refused the connection and said: %s" -msgstr "" - -#: methods/ftp.cc:220 -#, c-format -msgid "USER failed, server said: %s" -msgstr "" - -#: methods/ftp.cc:227 -#, c-format -msgid "PASS failed, server said: %s" -msgstr "" - -#: methods/ftp.cc:247 -msgid "" -"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " -"is empty." -msgstr "" - -#: methods/ftp.cc:275 -#, c-format -msgid "Login script command '%s' failed, server said: %s" -msgstr "" - -#: methods/ftp.cc:301 -#, c-format -msgid "TYPE failed, server said: %s" -msgstr "" - -#: methods/ftp.cc:339 methods/ftp.cc:450 methods/rsh.cc:190 methods/rsh.cc:233 -msgid "Connection timeout" -msgstr "" - -#: methods/ftp.cc:345 -msgid "Server closed the connection" -msgstr "" - -#: methods/ftp.cc:348 apt-pkg/contrib/fileutl.cc:832 methods/rsh.cc:197 -msgid "Read error" -msgstr "" - -#: methods/ftp.cc:355 methods/rsh.cc:204 -msgid "A response overflowed the buffer." -msgstr "" - -#: methods/ftp.cc:372 methods/ftp.cc:384 -msgid "Protocol corruption" -msgstr "" - -#: methods/ftp.cc:456 apt-pkg/contrib/fileutl.cc:874 methods/rsh.cc:239 -msgid "Write error" -msgstr "" - -#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:738 -msgid "Could not create a socket" -msgstr "" - -#: methods/ftp.cc:707 -msgid "Could not connect data socket, connection timed out" -msgstr "" - -#: methods/ftp.cc:713 -msgid "Could not connect passive socket." -msgstr "" - -#: methods/ftp.cc:731 -msgid "getaddrinfo was unable to get a listening socket" -msgstr "" - -#: methods/ftp.cc:745 -msgid "Could not bind a socket" -msgstr "" - -#: methods/ftp.cc:749 -msgid "Could not listen on the socket" -msgstr "" - -#: methods/ftp.cc:756 -msgid "Could not determine the socket's name" -msgstr "" - -#: methods/ftp.cc:788 -msgid "Unable to send PORT command" -msgstr "" - -#: methods/ftp.cc:798 -#, c-format -msgid "Unknown address family %u (AF_*)" -msgstr "" - -#: methods/ftp.cc:807 -#, c-format -msgid "EPRT failed, server said: %s" -msgstr "" - -#: methods/ftp.cc:827 -msgid "Data socket connect timed out" -msgstr "" - -#: methods/ftp.cc:834 -msgid "Unable to accept connection" -msgstr "" - -#: methods/ftp.cc:873 methods/http.cc:1031 methods/rsh.cc:309 -msgid "Problem hashing file" -msgstr "" - -#: methods/ftp.cc:886 -#, c-format -msgid "Unable to fetch file, server said '%s'" -msgstr "" - -#: methods/ftp.cc:901 methods/rsh.cc:328 -msgid "Data socket timed out" -msgstr "" - -#: methods/ftp.cc:931 -#, c-format -msgid "Data transfer failed, server said '%s'" -msgstr "" - -#. Get the files information -#: methods/ftp.cc:1008 -msgid "Query" -msgstr "" - -#: methods/ftp.cc:1120 -msgid "Unable to invoke " -msgstr "" - -#: methods/connect.cc:75 -#, c-format -msgid "Connecting to %s (%s)" -msgstr "" - -#: methods/connect.cc:86 -#, c-format -msgid "[IP: %s %s]" -msgstr "" - -#: methods/connect.cc:93 -#, c-format -msgid "Could not create a socket for %s (f=%u t=%u p=%u)" -msgstr "" - -#: methods/connect.cc:99 -#, c-format -msgid "Cannot initiate the connection to %s:%s (%s)." -msgstr "" - -#: methods/connect.cc:107 -#, c-format -msgid "Could not connect to %s:%s (%s), connection timed out" -msgstr "" - -#: methods/connect.cc:125 -#, c-format -msgid "Could not connect to %s:%s (%s)." -msgstr "" - -#. We say this mainly because the pause here is for the -#. ssh connection that is still going -#: methods/connect.cc:153 methods/rsh.cc:431 -#, c-format -msgid "Connecting to %s" -msgstr "" - -#: methods/connect.cc:172 methods/connect.cc:191 -#, c-format -msgid "Could not resolve '%s'" -msgstr "" - -#: methods/connect.cc:197 -#, c-format -msgid "Temporary failure resolving '%s'" -msgstr "" - -#: methods/connect.cc:200 -#, c-format -msgid "Something wicked happened resolving '%s:%s' (%i - %s)" -msgstr "" - -#: methods/connect.cc:247 -#, c-format -msgid "Unable to connect to %s:%s:" -msgstr "" - -#: methods/gpgv.cc:172 -msgid "" -"Internal error: Good signature, but could not determine key fingerprint?!" -msgstr "" - -#: methods/gpgv.cc:177 -msgid "At least one invalid signature was encountered." -msgstr "" - -#: methods/gpgv.cc:181 -msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" -msgstr "" - -#: methods/gpgv.cc:186 -msgid "Unknown error executing gpgv" -msgstr "" - -#: methods/gpgv.cc:220 methods/gpgv.cc:227 -msgid "The following signatures were invalid:\n" -msgstr "" - -#: methods/gpgv.cc:234 -msgid "" -"The following signatures couldn't be verified because the public key is not " -"available:\n" -msgstr "" - -#: methods/http.cc:393 -msgid "Waiting for headers" -msgstr "" - -#: methods/http.cc:539 -#, c-format -msgid "Got a single header line over %u chars" -msgstr "" - -#: methods/http.cc:547 -msgid "Bad header line" -msgstr "" - -#: methods/http.cc:572 methods/http.cc:579 -msgid "The HTTP server sent an invalid reply header" -msgstr "" - -#: methods/http.cc:608 -msgid "The HTTP server sent an invalid Content-Length header" -msgstr "" - -#: methods/http.cc:623 -msgid "The HTTP server sent an invalid Content-Range header" -msgstr "" - -#: methods/http.cc:625 -msgid "This HTTP server has broken range support" -msgstr "" - -#: methods/http.cc:649 -msgid "Unknown date format" -msgstr "" - -#: methods/http.cc:808 -msgid "Select failed" -msgstr "" - -#: methods/http.cc:813 -msgid "Connection timed out" -msgstr "" - -#: methods/http.cc:836 -msgid "Error writing to output file" -msgstr "" - -#: methods/http.cc:867 -msgid "Error writing to file" -msgstr "" - -#: methods/http.cc:895 -msgid "Error writing to the file" -msgstr "" - -#: methods/http.cc:909 -msgid "Error reading from server. Remote end closed connection" -msgstr "" - -#: methods/http.cc:911 -msgid "Error reading from server" -msgstr "" - -#: methods/http.cc:1016 apt-pkg/contrib/mmap.cc:293 -msgid "Failed to truncate file" -msgstr "" - -#: methods/http.cc:1191 -msgid "Bad header data" -msgstr "" - -#: methods/http.cc:1208 methods/http.cc:1263 -msgid "Connection failed" -msgstr "" - -#: methods/http.cc:1355 -msgid "Internal error" -msgstr "" - -#: apt-pkg/contrib/mmap.cc:79 -msgid "Can't mmap an empty file" -msgstr "" - -#: apt-pkg/contrib/mmap.cc:91 -#, c-format -msgid "Couldn't duplicate file descriptor %i" -msgstr "" - -#: apt-pkg/contrib/mmap.cc:99 -#, c-format -msgid "Couldn't make mmap of %llu bytes" -msgstr "" - -#: apt-pkg/contrib/mmap.cc:126 -msgid "Unable to close mmap" -msgstr "" - -#: apt-pkg/contrib/mmap.cc:154 apt-pkg/contrib/mmap.cc:182 -msgid "Unable to synchronize mmap" -msgstr "" - -#: apt-pkg/contrib/mmap.cc:260 -#, c-format -msgid "Couldn't make mmap of %lu bytes" -msgstr "" - -#: apt-pkg/contrib/mmap.cc:312 -#, c-format -msgid "" -"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " -"Current value: %lu. (man 5 apt.conf)" -msgstr "" - -#: apt-pkg/contrib/mmap.cc:411 -#, c-format -msgid "" -"Unable to increase the size of the MMap as the limit of %lu bytes is already " -"reached." -msgstr "" - -#: apt-pkg/contrib/mmap.cc:414 -msgid "" -"Unable to increase size of the MMap as automatic growing is disabled by user." -msgstr "" - -#. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:371 -#, c-format -msgid "%lid %lih %limin %lis" -msgstr "" - -#. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:378 -#, c-format -msgid "%lih %limin %lis" -msgstr "" - -#. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:385 -#, c-format -msgid "%limin %lis" -msgstr "" - -#. s means seconds -#: apt-pkg/contrib/strutl.cc:390 -#, c-format -msgid "%lis" -msgstr "" - -#: apt-pkg/contrib/strutl.cc:1165 -#, c-format -msgid "Selection %s not found" -msgstr "" - -#: apt-pkg/contrib/configuration.cc:468 -#, c-format -msgid "Unrecognized type abbreviation: '%c'" -msgstr "" - -#: apt-pkg/contrib/configuration.cc:526 -#, c-format -msgid "Opening configuration file %s" -msgstr "" - -#: apt-pkg/contrib/configuration.cc:694 -#, c-format -msgid "Syntax error %s:%u: Block starts with no name." -msgstr "" - -#: apt-pkg/contrib/configuration.cc:713 -#, c-format -msgid "Syntax error %s:%u: Malformed tag" -msgstr "" - -#: apt-pkg/contrib/configuration.cc:730 -#, c-format -msgid "Syntax error %s:%u: Extra junk after value" -msgstr "" - -#: apt-pkg/contrib/configuration.cc:770 -#, c-format -msgid "Syntax error %s:%u: Directives can only be done at the top level" -msgstr "" - -#: apt-pkg/contrib/configuration.cc:777 -#, c-format -msgid "Syntax error %s:%u: Too many nested includes" -msgstr "" - -#: apt-pkg/contrib/configuration.cc:781 apt-pkg/contrib/configuration.cc:786 -#, c-format -msgid "Syntax error %s:%u: Included from here" -msgstr "" - -#: apt-pkg/contrib/configuration.cc:790 -#, c-format -msgid "Syntax error %s:%u: Unsupported directive '%s'" -msgstr "" - -#: apt-pkg/contrib/configuration.cc:793 -#, c-format -msgid "Syntax error %s:%u: clear directive requires an option tree as argument" -msgstr "" - -#: apt-pkg/contrib/configuration.cc:843 -#, c-format -msgid "Syntax error %s:%u: Extra junk at end of file" -msgstr "" - -#: apt-pkg/contrib/progress.cc:146 -#, c-format -msgid "%c%s... Error!" -msgstr "" - -#: apt-pkg/contrib/progress.cc:148 -#, c-format -msgid "%c%s... Done" -msgstr "" - -#: apt-pkg/contrib/cmndline.cc:80 -#, c-format -msgid "Command line option '%c' [from %s] is not known." -msgstr "" - -#: apt-pkg/contrib/cmndline.cc:104 apt-pkg/contrib/cmndline.cc:112 -#: apt-pkg/contrib/cmndline.cc:120 -#, c-format -msgid "Command line option %s is not understood" -msgstr "" - -#: apt-pkg/contrib/cmndline.cc:125 -#, c-format -msgid "Command line option %s is not boolean" -msgstr "" - -#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 -#, c-format -msgid "Option %s requires an argument." -msgstr "" - -#: apt-pkg/contrib/cmndline.cc:200 apt-pkg/contrib/cmndline.cc:206 -#, c-format -msgid "Option %s: Configuration item specification must have an =<val>." -msgstr "" - -#: apt-pkg/contrib/cmndline.cc:235 -#, c-format -msgid "Option %s requires an integer argument, not '%s'" -msgstr "" - -#: apt-pkg/contrib/cmndline.cc:266 -#, c-format -msgid "Option '%s' is too long" -msgstr "" - -#: apt-pkg/contrib/cmndline.cc:298 -#, c-format -msgid "Sense %s is not understood, try true or false." -msgstr "" - -#: apt-pkg/contrib/cmndline.cc:348 -#, c-format -msgid "Invalid operation %s" -msgstr "" - -#: apt-pkg/contrib/cdromutl.cc:56 -#, c-format -msgid "Unable to stat the mount point %s" -msgstr "" - -#: apt-pkg/contrib/cdromutl.cc:179 apt-pkg/contrib/cdromutl.cc:213 -#: apt-pkg/acquire.cc:462 apt-pkg/acquire.cc:487 apt-pkg/clean.cc:42 -#: methods/mirror.cc:101 -#, c-format -msgid "Unable to change to %s" -msgstr "" - -#: apt-pkg/contrib/cdromutl.cc:224 -msgid "Failed to stat the cdrom" -msgstr "" - -#: apt-pkg/contrib/fileutl.cc:169 -#, c-format -msgid "Not using locking for read only lock file %s" -msgstr "" - -#: apt-pkg/contrib/fileutl.cc:174 -#, c-format -msgid "Could not open lock file %s" -msgstr "" - -#: apt-pkg/contrib/fileutl.cc:192 -#, c-format -msgid "Not using locking for nfs mounted lock file %s" -msgstr "" - -#: apt-pkg/contrib/fileutl.cc:196 -#, c-format -msgid "Could not get lock %s" -msgstr "" - -#: apt-pkg/contrib/fileutl.cc:336 -#, c-format -msgid "List of files can't be created as '%s' is not a directory" -msgstr "" - -#: apt-pkg/contrib/fileutl.cc:363 -#, c-format -msgid "Ignoring '%s' in directory '%s' as it is not a regular file" -msgstr "" - -#: apt-pkg/contrib/fileutl.cc:381 -#, c-format -msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" -msgstr "" - -#: apt-pkg/contrib/fileutl.cc:390 -#, c-format -msgid "" -"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" -msgstr "" - -#: apt-pkg/contrib/fileutl.cc:691 -#, c-format -msgid "Waited for %s but it wasn't there" -msgstr "" - -#: apt-pkg/contrib/fileutl.cc:703 -#, c-format -msgid "Sub-process %s received a segmentation fault." -msgstr "" - -#: apt-pkg/contrib/fileutl.cc:705 -#, c-format -msgid "Sub-process %s received signal %u." -msgstr "" - -#: apt-pkg/contrib/fileutl.cc:709 -#, c-format -msgid "Sub-process %s returned an error code (%u)" -msgstr "" - -#: apt-pkg/contrib/fileutl.cc:711 -#, c-format -msgid "Sub-process %s exited unexpectedly" -msgstr "" - -#: apt-pkg/contrib/fileutl.cc:776 apt-pkg/indexcopy.cc:676 -#, c-format -msgid "Could not open file %s" -msgstr "" - -#: apt-pkg/contrib/fileutl.cc:793 -#, c-format -msgid "Could not open file descriptor %d" -msgstr "" - -#: apt-pkg/contrib/fileutl.cc:853 -#, c-format -msgid "read, still have %llu to read but none left" -msgstr "" - -#: apt-pkg/contrib/fileutl.cc:886 -#, c-format -msgid "write, still have %llu to write but couldn't" -msgstr "" - -#: apt-pkg/contrib/fileutl.cc:1023 -#, c-format -msgid "Problem closing the gzip file %s" -msgstr "" - -#: apt-pkg/contrib/fileutl.cc:1026 -#, c-format -msgid "Problem closing the file %s" -msgstr "" - -#: apt-pkg/contrib/fileutl.cc:1031 -#, c-format -msgid "Problem renaming the file %s to %s" -msgstr "" - -#: apt-pkg/contrib/fileutl.cc:1042 -#, c-format -msgid "Problem unlinking the file %s" -msgstr "" - -#: apt-pkg/contrib/fileutl.cc:1055 -msgid "Problem syncing the file" -msgstr "" - -#: apt-pkg/pkgcache.cc:148 -msgid "Empty package cache" -msgstr "" - -#: apt-pkg/pkgcache.cc:154 -msgid "The package cache file is corrupted" -msgstr "" - -#: apt-pkg/pkgcache.cc:159 -msgid "The package cache file is an incompatible version" -msgstr "" - -#: apt-pkg/pkgcache.cc:162 -msgid "The package cache file is corrupted, it is too small" -msgstr "" - -#: apt-pkg/pkgcache.cc:167 -#, c-format -msgid "This APT does not support the versioning system '%s'" -msgstr "" - -#: apt-pkg/pkgcache.cc:172 -msgid "The package cache was built for a different architecture" -msgstr "" - -#: apt-pkg/pkgcache.cc:305 -msgid "Depends" -msgstr "" - -#: apt-pkg/pkgcache.cc:305 -msgid "PreDepends" -msgstr "" - -#: apt-pkg/pkgcache.cc:305 -msgid "Suggests" -msgstr "" - -#: apt-pkg/pkgcache.cc:306 -msgid "Recommends" -msgstr "" - -#: apt-pkg/pkgcache.cc:306 -msgid "Conflicts" -msgstr "" - -#: apt-pkg/pkgcache.cc:306 -msgid "Replaces" -msgstr "" - -#: apt-pkg/pkgcache.cc:307 -msgid "Obsoletes" -msgstr "" - -#: apt-pkg/pkgcache.cc:307 -msgid "Breaks" -msgstr "" - -#: apt-pkg/pkgcache.cc:307 -msgid "Enhances" -msgstr "" - -#: apt-pkg/pkgcache.cc:318 -msgid "important" -msgstr "" - -#: apt-pkg/pkgcache.cc:318 -msgid "required" -msgstr "" - -#: apt-pkg/pkgcache.cc:318 -msgid "standard" -msgstr "" - -#: apt-pkg/pkgcache.cc:319 -msgid "optional" -msgstr "" - -#: apt-pkg/pkgcache.cc:319 -msgid "extra" -msgstr "" - -#: apt-pkg/depcache.cc:130 apt-pkg/depcache.cc:159 -msgid "Building dependency tree" -msgstr "" - -#: apt-pkg/depcache.cc:131 -msgid "Candidate versions" -msgstr "" - -#: apt-pkg/depcache.cc:160 -msgid "Dependency generation" -msgstr "" - -#: apt-pkg/depcache.cc:180 apt-pkg/depcache.cc:213 apt-pkg/depcache.cc:217 -msgid "Reading state information" -msgstr "" - -#: apt-pkg/depcache.cc:242 -#, c-format -msgid "Failed to open StateFile %s" -msgstr "" - -#: apt-pkg/depcache.cc:248 -#, c-format -msgid "Failed to write temporary StateFile %s" -msgstr "" - -#: apt-pkg/tagfile.cc:126 -#, c-format -msgid "Unable to parse package file %s (1)" -msgstr "" - -#: apt-pkg/tagfile.cc:213 -#, c-format -msgid "Unable to parse package file %s (2)" -msgstr "" - -#: apt-pkg/sourcelist.cc:96 -#, c-format -msgid "Malformed line %lu in source list %s ([option] unparseable)" -msgstr "" - -#: apt-pkg/sourcelist.cc:99 -#, c-format -msgid "Malformed line %lu in source list %s ([option] too short)" -msgstr "" - -#: apt-pkg/sourcelist.cc:110 -#, c-format -msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" -msgstr "" - -#: apt-pkg/sourcelist.cc:116 -#, c-format -msgid "Malformed line %lu in source list %s ([%s] has no key)" -msgstr "" - -#: apt-pkg/sourcelist.cc:119 -#, c-format -msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" -msgstr "" - -#: apt-pkg/sourcelist.cc:132 -#, c-format -msgid "Malformed line %lu in source list %s (URI)" -msgstr "" - -#: apt-pkg/sourcelist.cc:134 -#, c-format -msgid "Malformed line %lu in source list %s (dist)" -msgstr "" - -#: apt-pkg/sourcelist.cc:137 -#, c-format -msgid "Malformed line %lu in source list %s (URI parse)" -msgstr "" - -#: apt-pkg/sourcelist.cc:143 -#, c-format -msgid "Malformed line %lu in source list %s (absolute dist)" -msgstr "" - -#: apt-pkg/sourcelist.cc:150 -#, c-format -msgid "Malformed line %lu in source list %s (dist parse)" -msgstr "" - -#: apt-pkg/sourcelist.cc:248 -#, c-format -msgid "Opening %s" -msgstr "" - -#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:447 -#, c-format -msgid "Line %u too long in source list %s." -msgstr "" - -#: apt-pkg/sourcelist.cc:285 -#, c-format -msgid "Malformed line %u in source list %s (type)" -msgstr "" - -#: apt-pkg/sourcelist.cc:289 -#, c-format -msgid "Type '%s' is not known on line %u in source list %s" -msgstr "" - -#: apt-pkg/packagemanager.cc:298 apt-pkg/packagemanager.cc:770 -#, c-format -msgid "" -"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " -"under APT::Immediate-Configure for details. (%d)" -msgstr "" - -#: apt-pkg/packagemanager.cc:432 apt-pkg/packagemanager.cc:462 -#, c-format -msgid "Could not configure '%s'. " -msgstr "" - -#: apt-pkg/packagemanager.cc:502 -#, c-format -msgid "" -"This installation run will require temporarily removing the essential " -"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if " -"you really want to do it, activate the APT::Force-LoopBreak option." -msgstr "" - -#: apt-pkg/pkgrecords.cc:34 -#, c-format -msgid "Index file type '%s' is not supported" -msgstr "" - -#: apt-pkg/algorithms.cc:255 -#, c-format -msgid "" -"The package %s needs to be reinstalled, but I can't find an archive for it." -msgstr "" - -#: apt-pkg/algorithms.cc:1191 -msgid "" -"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " -"held packages." -msgstr "" - -#: apt-pkg/algorithms.cc:1193 -msgid "Unable to correct problems, you have held broken packages." -msgstr "" - -#: apt-pkg/algorithms.cc:1518 apt-pkg/algorithms.cc:1520 -msgid "" -"Some index files failed to download. They have been ignored, or old ones " -"used instead." -msgstr "" - -#: apt-pkg/acquire.cc:81 -#, c-format -msgid "List directory %spartial is missing." -msgstr "" - -#: apt-pkg/acquire.cc:85 -#, c-format -msgid "Archives directory %spartial is missing." -msgstr "" - -#: apt-pkg/acquire.cc:93 -#, c-format -msgid "Unable to lock directory %s" -msgstr "" - -#. only show the ETA if it makes sense -#. two days -#: apt-pkg/acquire.cc:864 -#, c-format -msgid "Retrieving file %li of %li (%s remaining)" -msgstr "" - -#: apt-pkg/acquire.cc:866 -#, c-format -msgid "Retrieving file %li of %li" -msgstr "" - -#: apt-pkg/acquire-worker.cc:112 -#, c-format -msgid "The method driver %s could not be found." -msgstr "" - -#: apt-pkg/acquire-worker.cc:161 -#, c-format -msgid "Method %s did not start correctly" -msgstr "" - -#: apt-pkg/acquire-worker.cc:425 -#, c-format -msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." -msgstr "" - -#: apt-pkg/init.cc:151 -#, c-format -msgid "Packaging system '%s' is not supported" -msgstr "" - -#: apt-pkg/init.cc:167 -msgid "Unable to determine a suitable packaging system type" -msgstr "" - -#: apt-pkg/clean.cc:59 -#, c-format -msgid "Unable to stat %s." -msgstr "" - -#: apt-pkg/srcrecords.cc:47 -msgid "You must put some 'source' URIs in your sources.list" -msgstr "" - -#: apt-pkg/cachefile.cc:87 -msgid "The package lists or status file could not be parsed or opened." -msgstr "" - -#: apt-pkg/cachefile.cc:91 -msgid "You may want to run apt-get update to correct these problems" -msgstr "" - -#: apt-pkg/cachefile.cc:109 -msgid "The list of sources could not be read." -msgstr "" - -#: apt-pkg/policy.cc:74 -#, c-format -msgid "" -"The value '%s' is invalid for APT::Default-Release as such a release is not " -"available in the sources" -msgstr "" - -#: apt-pkg/policy.cc:396 -#, c-format -msgid "Invalid record in the preferences file %s, no Package header" -msgstr "" - -#: apt-pkg/policy.cc:418 -#, c-format -msgid "Did not understand pin type %s" -msgstr "" - -#: apt-pkg/policy.cc:426 -msgid "No priority (or zero) specified for pin" -msgstr "" - -#: apt-pkg/pkgcachegen.cc:83 -msgid "Cache has an incompatible versioning system" -msgstr "" - -#. TRANSLATOR: The first placeholder is a package name, -#. the other two should be copied verbatim as they include debug info -#: apt-pkg/pkgcachegen.cc:209 apt-pkg/pkgcachegen.cc:275 -#: apt-pkg/pkgcachegen.cc:311 apt-pkg/pkgcachegen.cc:353 -#: apt-pkg/pkgcachegen.cc:357 apt-pkg/pkgcachegen.cc:374 -#: apt-pkg/pkgcachegen.cc:384 apt-pkg/pkgcachegen.cc:388 -#: apt-pkg/pkgcachegen.cc:392 apt-pkg/pkgcachegen.cc:413 -#: apt-pkg/pkgcachegen.cc:418 apt-pkg/pkgcachegen.cc:463 -#: apt-pkg/pkgcachegen.cc:494 apt-pkg/pkgcachegen.cc:508 -#, c-format -msgid "Error occurred while processing %s (%s%d)" -msgstr "" - -#: apt-pkg/pkgcachegen.cc:232 -msgid "Wow, you exceeded the number of package names this APT is capable of." -msgstr "" - -#: apt-pkg/pkgcachegen.cc:235 -msgid "Wow, you exceeded the number of versions this APT is capable of." -msgstr "" - -#: apt-pkg/pkgcachegen.cc:238 -msgid "Wow, you exceeded the number of descriptions this APT is capable of." -msgstr "" - -#: apt-pkg/pkgcachegen.cc:241 -msgid "Wow, you exceeded the number of dependencies this APT is capable of." -msgstr "" - -#: apt-pkg/pkgcachegen.cc:515 -#, c-format -msgid "Package %s %s was not found while processing file dependencies" -msgstr "" - -#: apt-pkg/pkgcachegen.cc:1080 -#, c-format -msgid "Couldn't stat source package list %s" -msgstr "" - -#: apt-pkg/pkgcachegen.cc:1185 -msgid "Collecting File Provides" -msgstr "" - -#: apt-pkg/pkgcachegen.cc:1376 apt-pkg/pkgcachegen.cc:1383 -msgid "IO Error saving source cache" -msgstr "" - -#: apt-pkg/acquire-item.cc:139 -#, c-format -msgid "rename failed, %s (%s -> %s)." -msgstr "" - -#: apt-pkg/acquire-item.cc:640 -msgid "MD5Sum mismatch" -msgstr "" - -#: apt-pkg/acquire-item.cc:911 apt-pkg/acquire-item.cc:1863 -#: apt-pkg/acquire-item.cc:2006 -msgid "Hash Sum mismatch" -msgstr "" - -#: apt-pkg/acquire-item.cc:1399 -#, c-format -msgid "" -"Unable to find expected entry '%s' in Release file (Wrong sources.list entry " -"or malformed file)" -msgstr "" - -#: apt-pkg/acquire-item.cc:1415 -#, c-format -msgid "Unable to find hash sum for '%s' in Release file" -msgstr "" - -#: apt-pkg/acquire-item.cc:1450 -msgid "There is no public key available for the following key IDs:\n" -msgstr "" - -#: apt-pkg/acquire-item.cc:1488 -#, c-format -msgid "" -"Release file for %s is expired (invalid since %s). Updates for this " -"repository will not be applied." -msgstr "" - -#: apt-pkg/acquire-item.cc:1510 -#, c-format -msgid "Conflicting distribution: %s (expected %s but got %s)" -msgstr "" - -#: apt-pkg/acquire-item.cc:1543 -#, c-format -msgid "" -"A error occurred during the signature verification. The repository is not " -"updated and the previous index files will be used. GPG error: %s: %s\n" -msgstr "" - -#. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1553 apt-pkg/acquire-item.cc:1558 -#, c-format -msgid "GPG error: %s: %s" -msgstr "" - -#: apt-pkg/acquire-item.cc:1650 -#, c-format -msgid "" -"I wasn't able to locate a file for the %s package. This might mean you need " -"to manually fix this package. (due to missing arch)" -msgstr "" - -#: apt-pkg/acquire-item.cc:1709 -#, c-format -msgid "" -"I wasn't able to locate a file for the %s package. This might mean you need " -"to manually fix this package." -msgstr "" - -#: apt-pkg/acquire-item.cc:1768 -#, c-format -msgid "" -"The package index files are corrupted. No Filename: field for package %s." -msgstr "" - -#: apt-pkg/acquire-item.cc:1855 -msgid "Size mismatch" -msgstr "" - -#: apt-pkg/indexrecords.cc:61 -#, c-format -msgid "Unable to parse Release file %s" -msgstr "" - -#: apt-pkg/indexrecords.cc:71 -#, c-format -msgid "No sections in Release file %s" -msgstr "" - -#: apt-pkg/indexrecords.cc:105 -#, c-format -msgid "No Hash entry in Release file %s" -msgstr "" - -#: apt-pkg/indexrecords.cc:118 -#, c-format -msgid "Invalid 'Valid-Until' entry in Release file %s" -msgstr "" - -#: apt-pkg/indexrecords.cc:137 -#, c-format -msgid "Invalid 'Date' entry in Release file %s" -msgstr "" - -#: apt-pkg/vendorlist.cc:78 -#, c-format -msgid "Vendor block %s contains no fingerprint" -msgstr "" - -#: apt-pkg/cdrom.cc:528 -#, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" -msgstr "" - -#: apt-pkg/cdrom.cc:537 apt-pkg/cdrom.cc:634 -msgid "Identifying.. " -msgstr "" - -#: apt-pkg/cdrom.cc:565 -#, c-format -msgid "Stored label: %s\n" -msgstr "" - -#: apt-pkg/cdrom.cc:574 apt-pkg/cdrom.cc:850 -msgid "Unmounting CD-ROM...\n" -msgstr "" - -#: apt-pkg/cdrom.cc:594 -#, c-format -msgid "Using CD-ROM mount point %s\n" -msgstr "" - -#: apt-pkg/cdrom.cc:612 -msgid "Unmounting CD-ROM\n" -msgstr "" - -#: apt-pkg/cdrom.cc:617 -msgid "Waiting for disc...\n" -msgstr "" - -#: apt-pkg/cdrom.cc:626 -msgid "Mounting CD-ROM...\n" -msgstr "" - -#: apt-pkg/cdrom.cc:645 -msgid "Scanning disc for index files..\n" -msgstr "" - -#: apt-pkg/cdrom.cc:687 -#, c-format -msgid "" -"Found %zu package indexes, %zu source indexes, %zu translation indexes and " -"%zu signatures\n" -msgstr "" - -#: apt-pkg/cdrom.cc:698 -msgid "" -"Unable to locate any package files, perhaps this is not a Debian Disc or the " -"wrong architecture?" -msgstr "" - -#: apt-pkg/cdrom.cc:725 -#, c-format -msgid "Found label '%s'\n" -msgstr "" - -#: apt-pkg/cdrom.cc:754 -msgid "That is not a valid name, try again.\n" -msgstr "" - -#: apt-pkg/cdrom.cc:771 -#, c-format -msgid "" -"This disc is called: \n" -"'%s'\n" -msgstr "" - -#: apt-pkg/cdrom.cc:773 -msgid "Copying package lists..." -msgstr "" - -#: apt-pkg/cdrom.cc:800 -msgid "Writing new source list\n" -msgstr "" - -#: apt-pkg/cdrom.cc:808 -msgid "Source list entries for this disc are:\n" -msgstr "" - -#: apt-pkg/indexcopy.cc:273 apt-pkg/indexcopy.cc:930 -#, c-format -msgid "Wrote %i records.\n" -msgstr "" - -#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:932 -#, c-format -msgid "Wrote %i records with %i missing files.\n" -msgstr "" - -#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:935 -#, c-format -msgid "Wrote %i records with %i mismatched files\n" -msgstr "" - -#: apt-pkg/indexcopy.cc:281 apt-pkg/indexcopy.cc:938 -#, c-format -msgid "Wrote %i records with %i missing files and %i mismatched files\n" -msgstr "" - -#: apt-pkg/indexcopy.cc:540 -#, c-format -msgid "Skipping nonexistent file %s" -msgstr "" - -#: apt-pkg/indexcopy.cc:546 -#, c-format -msgid "Can't find authentication record for: %s" -msgstr "" - -#: apt-pkg/indexcopy.cc:552 -#, c-format -msgid "Hash mismatch for: %s" -msgstr "" - -#: apt-pkg/indexcopy.cc:680 -#, c-format -msgid "File %s doesn't start with a clearsigned message" -msgstr "" - -#. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/indexcopy.cc:711 -#, c-format -msgid "No keyring installed in %s." -msgstr "" - -#: apt-pkg/cacheset.cc:342 -#, c-format -msgid "Release '%s' for '%s' was not found" -msgstr "" - -#: apt-pkg/cacheset.cc:345 -#, c-format -msgid "Version '%s' for '%s' was not found" -msgstr "" - -#: apt-pkg/cacheset.cc:452 -#, c-format -msgid "Couldn't find task '%s'" -msgstr "" - -#: apt-pkg/cacheset.cc:459 -#, c-format -msgid "Couldn't find any package by regex '%s'" -msgstr "" - -#: apt-pkg/cacheset.cc:472 -#, c-format -msgid "Can't select versions from package '%s' as it is purely virtual" -msgstr "" - -#: apt-pkg/cacheset.cc:480 apt-pkg/cacheset.cc:488 -#, c-format -msgid "" -"Can't select installed nor candidate version from package '%s' as it has " -"neither of them" -msgstr "" - -#: apt-pkg/cacheset.cc:496 -#, c-format -msgid "Can't select newest version from package '%s' as it is purely virtual" -msgstr "" - -#: apt-pkg/cacheset.cc:504 -#, c-format -msgid "Can't select candidate version from package %s as it has no candidate" -msgstr "" - -#: apt-pkg/cacheset.cc:512 -#, c-format -msgid "Can't select installed version from package %s as it is not installed" -msgstr "" - -#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61 -msgid "Send scenario to solver" -msgstr "" - -#: apt-pkg/edsp.cc:213 -msgid "Send request to solver" -msgstr "" - -#: apt-pkg/edsp.cc:281 -msgid "Prepare for receiving solution" -msgstr "" - -#: apt-pkg/edsp.cc:288 -msgid "External solver failed without a proper error message" -msgstr "" - -#: apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:562 apt-pkg/edsp.cc:567 -msgid "Execute external solver" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:71 -#, c-format -msgid "Installing %s" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:72 apt-pkg/deb/dpkgpm.cc:866 -#, c-format -msgid "Configuring %s" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:873 -#, c-format -msgid "Removing %s" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:74 -#, c-format -msgid "Completely removing %s" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:75 -#, c-format -msgid "Noting disappearance of %s" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:76 -#, c-format -msgid "Running post-installation trigger %s" -msgstr "" - -#. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:672 -#, c-format -msgid "Directory '%s' missing" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:687 apt-pkg/deb/dpkgpm.cc:707 -#, c-format -msgid "Could not open file '%s'" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:859 -#, c-format -msgid "Preparing %s" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:860 -#, c-format -msgid "Unpacking %s" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:865 -#, c-format -msgid "Preparing to configure %s" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:867 -#, c-format -msgid "Installed %s" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:872 -#, c-format -msgid "Preparing for removal of %s" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:874 -#, c-format -msgid "Removed %s" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:879 -#, c-format -msgid "Preparing to completely remove %s" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:880 -#, c-format -msgid "Completely removed %s" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:1111 -msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:1141 -msgid "Running dpkg" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:1320 -msgid "Operation was interrupted before it could finish" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:1377 -msgid "No apport report written because MaxReports is reached already" -msgstr "" - -#. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1382 -msgid "dependency problems - leaving unconfigured" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:1384 -msgid "" -"No apport report written because the error message indicates its a followup " -"error from a previous failure." -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:1390 -msgid "" -"No apport report written because the error message indicates a disk full " -"error" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:1396 -msgid "" -"No apport report written because the error message indicates a out of memory " -"error" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:1403 -msgid "" -"No apport report written because the error message indicates a dpkg I/O error" -msgstr "" - -#: apt-pkg/deb/debsystem.cc:84 -#, c-format -msgid "" -"Unable to lock the administration directory (%s), is another process using " -"it?" -msgstr "" - -#: apt-pkg/deb/debsystem.cc:87 -#, c-format -msgid "Unable to lock the administration directory (%s), are you root?" -msgstr "" - -#. TRANSLATORS: the %s contains the recovery command, usually -#. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:103 -#, c-format -msgid "" -"dpkg was interrupted, you must manually run '%s' to correct the problem. " -msgstr "" - -#: apt-pkg/deb/debsystem.cc:121 -msgid "Not locked" -msgstr "" - -#. FIXME: fallback to a default mirror here instead -#. and provide a config option to define that default -#: methods/mirror.cc:279 -#, c-format -msgid "No mirror file '%s' found " -msgstr "" - -#. FIXME: fallback to a default mirror here instead -#. and provide a config option to define that default -#: methods/mirror.cc:286 -#, c-format -msgid "Can not read mirror file '%s'" -msgstr "" - -#: methods/mirror.cc:441 -#, c-format -msgid "[Mirror: %s]" -msgstr "" - -#: methods/rred.cc:509 -#, c-format -msgid "" -"Could not patch %s with mmap and with file operation usage - the patch seems " -"to be corrupt." -msgstr "" - -#: methods/rred.cc:514 -#, c-format -msgid "" -"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " -"to be corrupt." -msgstr "" - -#: methods/rsh.cc:336 -msgid "Connection closed prematurely" -msgstr "" -- cgit v1.2.3-70-g09d2 From 879daf177323f6fcb89188255fec07700e2c8bd1 Mon Sep 17 00:00:00 2001 From: Michael Vogt <michael.vogt@ubuntu.com> Date: Tue, 22 Nov 2011 11:34:01 +0100 Subject: fix remaining rename --- debian/libapt-pkg-dev.install | 3 --- debian/libapt-pkg-dev.install.in | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 debian/libapt-pkg-dev.install create mode 100644 debian/libapt-pkg-dev.install.in diff --git a/debian/libapt-pkg-dev.install b/debian/libapt-pkg-dev.install deleted file mode 100644 index be8022107..000000000 --- a/debian/libapt-pkg-dev.install +++ /dev/null @@ -1,3 +0,0 @@ -bin/libapt-pkg*.so usr/lib/@DEB_HOST_MULTIARCH@/ -bin/libapt-inst*.so usr/lib/@DEB_HOST_MULTIARCH@/ -include/apt-pkg/*.h usr/include/apt-pkg/ diff --git a/debian/libapt-pkg-dev.install.in b/debian/libapt-pkg-dev.install.in new file mode 100644 index 000000000..be8022107 --- /dev/null +++ b/debian/libapt-pkg-dev.install.in @@ -0,0 +1,3 @@ +bin/libapt-pkg*.so usr/lib/@DEB_HOST_MULTIARCH@/ +bin/libapt-inst*.so usr/lib/@DEB_HOST_MULTIARCH@/ +include/apt-pkg/*.h usr/include/apt-pkg/ -- cgit v1.2.3-70-g09d2 From 82c8f08ec6f2e1ae03ae4598ded13a204f9d272f Mon Sep 17 00:00:00 2001 From: Michael Vogt <michael.vogt@ubuntu.com> Date: Tue, 22 Nov 2011 18:59:28 +0100 Subject: * apt-pkg/cdrom.cc: - use aptconfiguration to get the supported compression types --- apt-pkg/cdrom.cc | 83 ++++++++++++++++++++++++++++++++++++-------------------- debian/changelog | 5 ++++ 2 files changed, 59 insertions(+), 29 deletions(-) diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc index d1bc1f3ba..07983e44f 100644 --- a/apt-pkg/cdrom.cc +++ b/apt-pkg/cdrom.cc @@ -78,27 +78,43 @@ bool pkgCdrom::FindPackages(string CD, { SigList.push_back(CD); } + /* Aha! We found some package files. We assume that everything under this dir is controlled by those package files so we don't look down anymore */ - if (stat("Packages",&Buf) == 0 || stat("Packages.gz",&Buf) == 0 || - stat("Packages.bz2",&Buf) == 0 || stat("Packages.xz",&Buf) == 0) - { - List.push_back(CD); + std::vector<std::string> types = APT::Configuration::getCompressionTypes(); + types.push_back(""); + for (std::vector<std::string>::const_iterator t = types.begin(); + t != types.end(); ++t) + { + std::string filename = std::string("Packages"); + if ((*t).size() > 0) + filename.append("."+*t); + if (stat(filename.c_str(), &Buf) == 0) + { + List.push_back(CD); - // Continue down if thorough is given - if (_config->FindB("APT::CDROM::Thorough",false) == false) - return true; - } - if (stat("Sources.xz",&Buf) == 0 || stat("Sources.bz2",&Buf) == 0 || - stat("Sources.gz",&Buf) == 0 || stat("Sources",&Buf) == 0) - { - SList.push_back(CD); + // Continue down if thorough is given + if (_config->FindB("APT::CDROM::Thorough",false) == false) + return true; + break; + } + } + for (std::vector<std::string>::const_iterator t = types.begin(); + t != types.end(); ++t) + { + std::string filename = std::string("Sources"); + if ((*t).size() > 0) + filename.append("."+*t); + { + SList.push_back(CD); - // Continue down if thorough is given - if (_config->FindB("APT::CDROM::Thorough",false) == false) - return true; - } + // Continue down if thorough is given + if (_config->FindB("APT::CDROM::Thorough",false) == false) + return true; + break; + } + } // see if we find translatin indexes if (stat("i18n",&Buf) == 0) @@ -111,12 +127,15 @@ bool pkgCdrom::FindPackages(string CD, if (_config->FindB("Debug::aptcdrom",false) == true) std::clog << "found translations: " << Dir->d_name << "\n"; string file = Dir->d_name; - if(file.substr(file.size()-3,file.size()) == ".gz" || - file.substr(file.size()-3,file.size()) == ".xz") - file = file.substr(0,file.size()-3); - if(file.substr(file.size()-4,file.size()) == ".bz2") - file = file.substr(0,file.size()-4); - TransList.push_back(CD+"i18n/"+ file); + for (std::vector<std::string>::const_iterator t = types.begin(); + t != types.end(); ++t) + { + std::string needle = "." + *t; + if(file.substr(file.size()-needle.size()) == needle) + file = file.substr(0, file.size()-needle.size()); + TransList.push_back(CD+"i18n/"+ file); + break; + } } } closedir(D); @@ -262,13 +281,19 @@ bool pkgCdrom::DropRepeats(vector<string> &List,const char *Name) for (unsigned int I = 0; I != List.size(); I++) { struct stat Buf; - if (stat((List[I] + Name).c_str(),&Buf) != 0 && - stat((List[I] + Name + ".gz").c_str(),&Buf) != 0 && - stat((List[I] + Name + ".bz2").c_str(),&Buf) != 0 && - stat((List[I] + Name + ".xz").c_str(),&Buf) != 0) - _error->Errno("stat","Failed to stat %s%s",List[I].c_str(), - Name); - Inodes[I] = Buf.st_ino; + std::vector<std::string> types = APT::Configuration::getCompressionTypes(); + types.push_back(""); + for (std::vector<std::string>::const_iterator t = types.begin(); + t != types.end(); ++t) + { + std::string filename = List[I] + Name; + if ((*t).size() > 0) + filename.append("." + *t); + if (stat(filename.c_str(), &Buf) != 0) + _error->Errno("stat","Failed to stat %s%s",List[I].c_str(), + Name); + Inodes[I] = Buf.st_ino; + } } if (_error->PendingError() == true) { diff --git a/debian/changelog b/debian/changelog index fab547fc8..2d37c0677 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,12 @@ apt (0.8.16~exp9) UNRELEASED; urgency=low + [ Julian Andres Klode ] * apt-pkg/cdrom.cc: - Accept .bz2, .xz files in addition to .gz files (Closes: #649451) + + [ Michael Vogt ] + * apt-pkg/cdrom.cc: + - use aptconfiguration to get the supported compression types -- Julian Andres Klode <jak@debian.org> Mon, 21 Nov 2011 18:46:36 +0100 -- cgit v1.2.3-70-g09d2 From 63b70b21c8416351cd5be9bf8dcf939ffe94079e Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Tue, 22 Nov 2011 21:54:32 +0100 Subject: fix the operator++ implementations in the cachesets --- apt-pkg/cacheset.h | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/apt-pkg/cacheset.h b/apt-pkg/cacheset.h index a23659efb..d1e396e0f 100644 --- a/apt-pkg/cacheset.h +++ b/apt-pkg/cacheset.h @@ -168,7 +168,8 @@ public: /*{{{*/ pkgCache::PkgIterator getPkg(void) const { return *_iter; } inline pkgCache::PkgIterator operator*(void) const { return *_iter; }; operator typename Container::const_iterator(void) const { return _iter; } - inline void operator++(void) { ++_iter; }; + inline const_iterator& operator++() { ++_iter; return *this; } + inline const_iterator operator++(int) { const_iterator tmp(*this); operator++(); return tmp; } inline bool operator!=(const_iterator const &i) const { return _iter != i._iter; }; inline bool operator==(const_iterator const &i) const { return _iter == i._iter; }; friend std::ostream& operator<<(std::ostream& out, const_iterator i) { return operator<<(out, *i); } @@ -182,7 +183,8 @@ public: /*{{{*/ inline pkgCache::PkgIterator operator*(void) const { return *_iter; }; operator typename Container::iterator(void) const { return _iter; } operator typename PackageContainer<Container>::const_iterator() { return PackageContainer<Container>::const_iterator(_iter); } - inline void operator++(void) { ++_iter; }; + inline iterator& operator++() { ++_iter; return *this; } + inline iterator operator++(int) { iterator tmp(*this); operator++(); return tmp; } inline bool operator!=(iterator const &i) const { return _iter != i._iter; }; inline bool operator==(iterator const &i) const { return _iter == i._iter; }; friend std::ostream& operator<<(std::ostream& out, iterator i) { return operator<<(out, *i); } @@ -482,7 +484,8 @@ public: /*{{{*/ pkgCache::VerIterator getVer(void) const { return *_iter; } inline pkgCache::VerIterator operator*(void) const { return *_iter; }; operator typename Container::const_iterator(void) const { return _iter; } - inline void operator++(void) { ++_iter; }; + inline const_iterator& operator++() { ++_iter; return *this; } + inline const_iterator operator++(int) { const_iterator tmp(*this); operator++(); return tmp; } inline bool operator!=(const_iterator const &i) const { return _iter != i._iter; }; inline bool operator==(const_iterator const &i) const { return _iter == i._iter; }; friend std::ostream& operator<<(std::ostream& out, const_iterator i) { return operator<<(out, *i); } @@ -496,7 +499,8 @@ public: /*{{{*/ inline pkgCache::VerIterator operator*(void) const { return *_iter; }; operator typename Container::iterator(void) const { return _iter; } operator typename VersionContainer<Container>::const_iterator() { return VersionContainer<Container>::const_iterator(_iter); } - inline void operator++(void) { ++_iter; }; + inline iterator& operator++() { ++_iter; return *this; } + inline iterator operator++(int) { iterator tmp(*this); operator++(); return tmp; } inline bool operator!=(iterator const &i) const { return _iter != i._iter; }; inline bool operator==(iterator const &i) const { return _iter == i._iter; }; friend std::ostream& operator<<(std::ostream& out, iterator i) { return operator<<(out, *i); } -- cgit v1.2.3-70-g09d2 From 2b5c35c7bb915dbd46fefd7c79f05364ba22f93b Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Wed, 23 Nov 2011 00:49:45 +0100 Subject: * apt-pkg/depcache.cc: - prefer native providers over foreigns even if the chain is foreign The code preferred real over virtual packages and based on priorities. This is changed in so far that a real package from any arch is preferred over any virtual provider and if priorities doesn't help in choosing the best provider we choose it based on architectures --- apt-pkg/depcache.cc | 91 ++++++++++++++++------- apt-pkg/pkgcache.h | 2 +- debian/changelog | 4 +- test/integration/test-multiarch-foreign | 128 ++++++++++++++++++++++++++++++++ 4 files changed, 195 insertions(+), 30 deletions(-) create mode 100755 test/integration/test-multiarch-foreign diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index 529e9240d..031fca5c0 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -23,7 +23,9 @@ #include <apt-pkg/pkgsystem.h> #include <apt-pkg/tagfile.h> #include <apt-pkg/progress.h> +#include <apt-pkg/cacheset.h> +#include <algorithm> #include <iostream> #include <sstream> #include <set> @@ -940,6 +942,51 @@ bool pkgDepCache::IsModeChangeOk(ModeList const mode, PkgIterator const &Pkg, // DepCache::MarkInstall - Put the package in the install state /*{{{*/ // --------------------------------------------------------------------- /* */ +struct CompareProviders { + pkgCache::PkgIterator const Pkg; + CompareProviders(pkgCache::DepIterator const &Dep) : Pkg(Dep.TargetPkg()) {}; + //bool operator() (APT::VersionList::iterator const &AV, APT::VersionList::iterator const &BV) + bool operator() (pkgCache::VerIterator const &AV, pkgCache::VerIterator const &BV) + { + pkgCache::PkgIterator const A = AV.ParentPkg(); + pkgCache::PkgIterator const B = BV.ParentPkg(); + // Prefer packages in the same group as the target; e.g. foo:i386, foo:amd64 + if (A->Group != B->Group) + { + if (A->Group == Pkg->Group && B->Group != Pkg->Group) + return false; + else if (B->Group == Pkg->Group && A->Group != Pkg->Group) + return true; + } + // we like essentials + if ((A->Flags & pkgCache::Flag::Essential) != (B->Flags & pkgCache::Flag::Essential)) + { + if ((A->Flags & pkgCache::Flag::Essential) == pkgCache::Flag::Essential) + return false; + else if ((B->Flags & pkgCache::Flag::Essential) == pkgCache::Flag::Essential) + return true; + } + // higher priority seems like a good idea + if (AV->Priority != BV->Priority) + return AV->Priority < BV->Priority; + // prefer native architecture + if (strcmp(A.Arch(), B.Arch()) != 0) + { + if (strcmp(A.Arch(), A.Cache()->NativeArch()) == 0) + return false; + else if (strcmp(B.Arch(), B.Cache()->NativeArch()) == 0) + return true; + std::vector<std::string> archs = APT::Configuration::getArchitectures(); + for (std::vector<std::string>::const_iterator a = archs.begin(); a != archs.end(); ++a) + if (*a == A.Arch()) + return false; + else if (*a == B.Arch()) + return true; + } + // unable to decide… + return A->ID < B->ID; + } +}; bool pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, unsigned long Depth, bool FromUser, bool ForceImportantDeps) @@ -1102,41 +1149,28 @@ bool pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, /* This bit is for processing the possibilty of an install/upgrade fixing the problem */ - SPtrArray<Version *> List = Start.AllTargets(); if (Start->Type != Dep::DpkgBreaks && (DepState[Start->ID] & DepCVer) == DepCVer) { - // Right, find the best version to install.. - Version **Cur = List; - PkgIterator P = Start.TargetPkg(); - PkgIterator InstPkg(*Cache,0); - - // See if there are direct matches (at the start of the list) - for (; *Cur != 0 && (*Cur)->ParentPkg == P.Index(); Cur++) + APT::VersionList verlist; + pkgCache::VerIterator Cand = PkgState[Start.TargetPkg()->ID].CandidateVerIter(*this); + if (Cand.end() == false && VS().CheckDep(Cand.VerStr(), Start->CompareOp, Start.TargetVer()) == true) + verlist.insert(Cand); + for (PrvIterator Prv = Start.TargetPkg().ProvidesList(); Prv.end() != true; ++Prv) { - PkgIterator Pkg(*Cache,Cache->PkgP + (*Cur)->ParentPkg); - if (PkgState[Pkg->ID].CandidateVer != *Cur) + pkgCache::VerIterator V = Prv.OwnerVer(); + pkgCache::VerIterator Cand = PkgState[Prv.OwnerPkg()->ID].CandidateVerIter(*this); + if (Cand.end() == true || V != Cand || + VS().CheckDep(Cand.VerStr(), Start->CompareOp, Start.TargetVer()) == false) continue; - InstPkg = Pkg; - break; + verlist.insert(Cand); } + CompareProviders comp(Start); + APT::VersionList::iterator InstVer = std::max_element(verlist.begin(), verlist.end(), comp); - // Select the highest priority providing package - if (InstPkg.end() == true) - { - pkgPrioSortList(*Cache,Cur); - for (; *Cur != 0; Cur++) - { - PkgIterator Pkg(*Cache,Cache->PkgP + (*Cur)->ParentPkg); - if (PkgState[Pkg->ID].CandidateVer != *Cur) - continue; - InstPkg = Pkg; - break; - } - } - - if (InstPkg.end() == false) + if (InstVer != verlist.end()) { + pkgCache::PkgIterator InstPkg = InstVer.ParentPkg(); if(DebugAutoInstall == true) std::clog << OutputInDepth(Depth) << "Installing " << InstPkg.Name() << " as " << Start.DepType() << " of " << Pkg.Name() @@ -1154,7 +1188,7 @@ bool pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, // mark automatic dependency MarkInstall(InstPkg,true,Depth + 1, false, ForceImportantDeps); // Set the autoflag, after MarkInstall because MarkInstall unsets it - if (P->CurrentVer == 0) + if (InstPkg->CurrentVer == 0) PkgState[InstPkg->ID].Flags |= Flag::Auto; } } @@ -1166,6 +1200,7 @@ bool pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, upgrade the package. */ if (Start.IsNegative() == true) { + SPtrArray<Version *> List = Start.AllTargets(); for (Version **I = List; *I != 0; I++) { VerIterator Ver(*this,*I); diff --git a/apt-pkg/pkgcache.h b/apt-pkg/pkgcache.h index 7e32a3a96..fd1a02149 100644 --- a/apt-pkg/pkgcache.h +++ b/apt-pkg/pkgcache.h @@ -198,6 +198,7 @@ class pkgCache /*{{{*/ inline PkgFileIterator FileEnd(); inline bool MultiArchCache() const { return MultiArchEnabled; }; + inline char const * const NativeArch() const; // Make me a function pkgVersioningSystem *VS; @@ -213,7 +214,6 @@ class pkgCache /*{{{*/ private: bool MultiArchEnabled; PkgIterator SingleArchFindPkg(const std::string &Name); - inline char const * const NativeArch() const; }; /*}}}*/ // Header structure /*{{{*/ diff --git a/debian/changelog b/debian/changelog index 058e2926e..0a66d2579 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,8 +16,10 @@ apt (0.8.16~exp8) experimental; urgency=low * cmdline/apt-{get,cache,mark}.cc: - use Lists instead of Sets if input order should be preserved for commands accepting lists of packages, e.g. policy (Closes: #625960) + * apt-pkg/depcache.cc: + - prefer native providers over foreigns even if the chain is foreign - -- David Kalnischkies <kalnischkies@gmail.com> Fri, 11 Nov 2011 15:55:13 +0100 + -- David Kalnischkies <kalnischkies@gmail.com> Wed, 23 Nov 2011 00:18:35 +0100 apt (0.8.16~exp7) experimental; urgency=low diff --git a/test/integration/test-multiarch-foreign b/test/integration/test-multiarch-foreign new file mode 100755 index 000000000..d0ad829a7 --- /dev/null +++ b/test/integration/test-multiarch-foreign @@ -0,0 +1,128 @@ +#!/bin/sh +set -e + +TESTDIR=$(readlink -f $(dirname $0)) +. $TESTDIR/framework +setupenvironment +configarchitecture 'amd64' 'i386' 'armel' + +insertpackage 'unstable' 'cool-foo' 'amd64,i386' '1.0' 'Depends: foo' +insertpackage 'unstable' 'foo' 'amd64,i386,armel' '1.0' 'Multi-Arch: foreign' + +insertpackage 'unstable' 'cool-bar' 'amd64,i386' '1.0' 'Depends: bar-provider' +insertpackage 'unstable' 'bar' 'amd64,i386,armel' '1.0' 'Provides: bar-provider +Multi-Arch: foreign' + +setupaptarchive + +testequal 'Reading package lists... +Building dependency tree... +The following extra packages will be installed: + foo +The following NEW packages will be installed: + cool-foo:i386 foo +0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded. +Inst foo (1.0 unstable [amd64]) +Inst cool-foo:i386 (1.0 unstable [i386]) +Conf foo (1.0 unstable [amd64]) +Conf cool-foo:i386 (1.0 unstable [i386])' aptget install cool-foo:i386 -s + +testequal 'Reading package lists... +Building dependency tree... +The following extra packages will be installed: + foo +The following NEW packages will be installed: + cool-foo foo +0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded. +Inst foo (1.0 unstable [amd64]) +Inst cool-foo (1.0 unstable [amd64]) +Conf foo (1.0 unstable [amd64]) +Conf cool-foo (1.0 unstable [amd64])' aptget install cool-foo:amd64 -s + +testequal 'Reading package lists... +Building dependency tree... +The following NEW packages will be installed: + cool-foo foo +0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded. +Inst foo (1.0 unstable [amd64]) +Inst cool-foo (1.0 unstable [amd64]) +Conf foo (1.0 unstable [amd64]) +Conf cool-foo (1.0 unstable [amd64])' aptget install cool-foo:amd64 foo:amd64 -s + +testequal 'Reading package lists... +Building dependency tree... +The following NEW packages will be installed: + cool-foo foo:i386 +0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded. +Inst foo:i386 (1.0 unstable [i386]) +Inst cool-foo (1.0 unstable [amd64]) +Conf foo:i386 (1.0 unstable [i386]) +Conf cool-foo (1.0 unstable [amd64])' aptget install cool-foo:amd64 foo:i386 -s + +testequal 'Reading package lists... +Building dependency tree... +The following NEW packages will be installed: + cool-foo foo:armel +0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded. +Inst foo:armel (1.0 unstable [armel]) +Inst cool-foo (1.0 unstable [amd64]) +Conf foo:armel (1.0 unstable [armel]) +Conf cool-foo (1.0 unstable [amd64])' aptget install cool-foo:amd64 foo:armel -s + + + + + +testequal 'Reading package lists... +Building dependency tree... +The following extra packages will be installed: + bar +The following NEW packages will be installed: + bar cool-bar:i386 +0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded. +Inst bar (1.0 unstable [amd64]) +Inst cool-bar:i386 (1.0 unstable [i386]) +Conf bar (1.0 unstable [amd64]) +Conf cool-bar:i386 (1.0 unstable [i386])' aptget install cool-bar:i386 -s + +testequal 'Reading package lists... +Building dependency tree... +The following extra packages will be installed: + bar +The following NEW packages will be installed: + bar cool-bar +0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded. +Inst bar (1.0 unstable [amd64]) +Inst cool-bar (1.0 unstable [amd64]) +Conf bar (1.0 unstable [amd64]) +Conf cool-bar (1.0 unstable [amd64])' aptget install cool-bar:amd64 -s + +testequal 'Reading package lists... +Building dependency tree... +The following NEW packages will be installed: + bar cool-bar +0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded. +Inst bar (1.0 unstable [amd64]) +Inst cool-bar (1.0 unstable [amd64]) +Conf bar (1.0 unstable [amd64]) +Conf cool-bar (1.0 unstable [amd64])' aptget install cool-bar:amd64 bar:amd64 -s + +testequal 'Reading package lists... +Building dependency tree... +The following NEW packages will be installed: + bar:i386 cool-bar +0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded. +Inst bar:i386 (1.0 unstable [i386]) +Inst cool-bar (1.0 unstable [amd64]) +Conf bar:i386 (1.0 unstable [i386]) +Conf cool-bar (1.0 unstable [amd64])' aptget install cool-bar:amd64 bar:i386 -s + +testequal 'Reading package lists... +Building dependency tree... +The following NEW packages will be installed: + bar:armel cool-bar +0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded. +Inst bar:armel (1.0 unstable [armel]) +Inst cool-bar (1.0 unstable [amd64]) +Conf bar:armel (1.0 unstable [armel]) +Conf cool-bar (1.0 unstable [amd64])' aptget install cool-bar:amd64 bar:armel -s -- cgit v1.2.3-70-g09d2 From 286afa36886b60bea0a17d244f8bddad938f27cf Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Wed, 23 Nov 2011 09:54:17 +0100 Subject: * cmdline/apt-get.cc: - ignore foreign architectures if we check if a provides has only one resolver as it's basically the same for the user, so no need to choose --- cmdline/apt-get.cc | 13 +++++++++++++ debian/changelog | 5 ++++- test/integration/test-multiarch-foreign | 22 ++++++++++++++++++++++ 3 files changed, 39 insertions(+), 1 deletion(-) diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 763f0edad..ca1169401 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -742,6 +742,19 @@ public: Prov = PPkg; found_one = true; } else if (PPkg != Prov) { + // same group, so it's a foreign package + if (PPkg->Group == Prov->Group) { + // do we already have the requested arch? + if (strcmp(Pkg.Arch(), Prov.Arch()) == 0 || + strcmp(Prov.Arch(), "all") == 0 || + unlikely(strcmp(PPkg.Arch(), Prov.Arch()) == 0)) // packages have only on candidate, but just to be sure + continue; + // see which architecture we prefer more and switch to it + std::vector<std::string> archs = APT::Configuration::getArchitectures(); + if (std::find(archs.begin(), archs.end(), PPkg.Arch()) < std::find(archs.begin(), archs.end(), Prov.Arch())) + Prov = PPkg; + continue; + } found_one = false; // we found at least two break; } diff --git a/debian/changelog b/debian/changelog index 0a66d2579..3c0de2c62 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,8 +18,11 @@ apt (0.8.16~exp8) experimental; urgency=low commands accepting lists of packages, e.g. policy (Closes: #625960) * apt-pkg/depcache.cc: - prefer native providers over foreigns even if the chain is foreign + * cmdline/apt-get.cc: + - ignore foreign architectures if we check if a provides has only one + resolver as it's basically the same for the user, so no need to choose - -- David Kalnischkies <kalnischkies@gmail.com> Wed, 23 Nov 2011 00:18:35 +0100 + -- David Kalnischkies <kalnischkies@gmail.com> Wed, 23 Nov 2011 09:52:20 +0100 apt (0.8.16~exp7) experimental; urgency=low diff --git a/test/integration/test-multiarch-foreign b/test/integration/test-multiarch-foreign index d0ad829a7..332466d96 100755 --- a/test/integration/test-multiarch-foreign +++ b/test/integration/test-multiarch-foreign @@ -126,3 +126,25 @@ Inst bar:armel (1.0 unstable [armel]) Inst cool-bar (1.0 unstable [amd64]) Conf bar:armel (1.0 unstable [armel]) Conf cool-bar (1.0 unstable [amd64])' aptget install cool-bar:amd64 bar:armel -s + +testequal "Reading package lists... +Building dependency tree... +Note, selecting 'bar' instead of 'bar-provider' +The following NEW packages will be installed: + bar cool-bar +0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded. +Inst bar (1.0 unstable [amd64]) +Inst cool-bar (1.0 unstable [amd64]) +Conf bar (1.0 unstable [amd64]) +Conf cool-bar (1.0 unstable [amd64])" aptget install cool-bar bar-provider -s -q=0 + +testequal "Reading package lists... +Building dependency tree... +Note, selecting 'bar:i386' instead of 'bar-provider:i386' +The following NEW packages will be installed: + bar:i386 cool-bar +0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded. +Inst bar:i386 (1.0 unstable [i386]) +Inst cool-bar (1.0 unstable [amd64]) +Conf bar:i386 (1.0 unstable [i386]) +Conf cool-bar (1.0 unstable [amd64])" aptget install cool-bar bar-provider:i386 -s -q=0 -- cgit v1.2.3-70-g09d2 From 5cbddfa3c7fd1d6be3657bdf2fae39c216fe5eeb Mon Sep 17 00:00:00 2001 From: Michael Vogt <michael.vogt@ubuntu.com> Date: Wed, 23 Nov 2011 11:04:24 +0100 Subject: fixup changelog --- debian/changelog | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/debian/changelog b/debian/changelog index 25e7fa18e..8b45cef39 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,20 +13,8 @@ apt (0.8.16~exp9) UNRELEASED; urgency=low [ Colin Watson ] * Convert libapt-pkg4.12 and libapt-inst1.4 to Multi-Arch: same. - - -- Julian Andres Klode <jak@debian.org> Mon, 21 Nov 2011 18:46:36 +0100 - -apt (0.8.16~exp8) experimental; urgency=low [ David Kalnischkies ] - * apt-pkg/packagemanager.cc: - - do not fail on unpacked packages in SmartUnPack, just don't - shedule them for unpack, but do all checks and configure them - - do not enter an endless loop for (essential) pre-dependency loops - * apt-pkg/contrib/sha2_internal.cc: - - use a pointer-union to peace gcc strict-aliasing warning - * apt-pkg/deb/deblistparser.cc: - - M-A: foreign packages provide for other archs, too * apt-pkg/cacheset.cc: - make the cachesets real containers which can embedding any container to be able to use the same interface regardless of set or list usage @@ -39,8 +27,22 @@ apt (0.8.16~exp8) experimental; urgency=low * cmdline/apt-get.cc: - ignore foreign architectures if we check if a provides has only one resolver as it's basically the same for the user, so no need to choose + + -- Julian Andres Klode <jak@debian.org> Mon, 21 Nov 2011 18:46:36 +0100 + +apt (0.8.16~exp8) experimental; urgency=low + + [ David Kalnischkies ] + * apt-pkg/packagemanager.cc: + - do not fail on unpacked packages in SmartUnPack, just don't + shedule them for unpack, but do all checks and configure them + - do not enter an endless loop for (essential) pre-dependency loops + * apt-pkg/contrib/sha2_internal.cc: + - use a pointer-union to peace gcc strict-aliasing warning + * apt-pkg/deb/deblistparser.cc: + - M-A: foreign packages provide for other archs, too - -- David Kalnischkies <kalnischkies@gmail.com> Wed, 23 Nov 2011 09:52:20 +0100 + -- David Kalnischkies <kalnischkies@gmail.com> Thu, 03 Nov 2011 09:40:29 -0500 apt (0.8.16~exp7) experimental; urgency=low -- cgit v1.2.3-70-g09d2 From 01366a44bf85a61d0a533e867922b6097bfb216d Mon Sep 17 00:00:00 2001 From: Steve McIntyre <steve@einval.com> Date: Wed, 23 Nov 2011 19:34:58 +0100 Subject: factored out the decompressor code in IndexCopy::CopyPackages() and TranslationsCopy::CopyTranslations() into a single common function --- apt-pkg/cdrom.cc | 2 +- apt-pkg/indexcopy.cc | 174 ++++++++++++++++++++++++++++----------------------- 2 files changed, 95 insertions(+), 81 deletions(-) diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc index 07983e44f..872879752 100644 --- a/apt-pkg/cdrom.cc +++ b/apt-pkg/cdrom.cc @@ -116,7 +116,7 @@ bool pkgCdrom::FindPackages(string CD, } } - // see if we find translatin indexes + // see if we find translation indices if (stat("i18n",&Buf) == 0) { D = opendir("i18n"); diff --git a/apt-pkg/indexcopy.cc b/apt-pkg/indexcopy.cc index 4df018ef4..84f9fd420 100644 --- a/apt-pkg/indexcopy.cc +++ b/apt-pkg/indexcopy.cc @@ -37,8 +37,83 @@ using namespace std; - - +// DecompressFile - wrapper for decompressing gzip/bzip2/xz compressed files /*{{{*/ +// --------------------------------------------------------------------- +/* */ +bool DecompressFile(string Filename, int *fd, off_t *FileSize) +{ + string CompressProg; + string CompressProgFind; + FileFd From; + struct stat Buf; + *fd = -1; + + if (stat((Filename + ".gz").c_str(), &Buf) == 0) + { + CompressProg = "gzip"; + CompressProgFind = "Dir::bin::gzip"; + From.Open(Filename + ".gz",FileFd::ReadOnly); + } + else if (stat((Filename + ".bz2").c_str(), &Buf) == 0) + { + CompressProg = "bzip2"; + CompressProgFind = "Dir::bin::bzip2"; + From.Open(Filename + ".bz2",FileFd::ReadOnly); + } + else if (stat((Filename + ".xz").c_str(), &Buf) == 0) + { + CompressProg = "xz"; + CompressProgFind = "Dir::bin::xz"; + From.Open(Filename + ".xz",FileFd::ReadOnly); + } + else + { + return _error->Errno("decompressor", "Unable to parse file"); + } + + if (_error->PendingError() == true) + return -1; + + *FileSize = Buf.st_size; + + // Get a temp file + FILE *tmp = tmpfile(); + if (tmp == 0) + return _error->Errno("tmpfile","Unable to create a tmp file"); + *fd = dup(fileno(tmp)); + fclose(tmp); + + // Fork decompressor + pid_t Process = fork(); + if (Process < 0) + return _error->Errno("fork","Couldn't fork to run decompressor"); + + // The child + if (Process == 0) + { + dup2(From.Fd(),STDIN_FILENO); + dup2(*fd,STDOUT_FILENO); + SetCloseExec(STDIN_FILENO,false); + SetCloseExec(STDOUT_FILENO,false); + + const char *Args[3]; + string Tmp = _config->Find(CompressProgFind, CompressProg); + Args[0] = Tmp.c_str(); + Args[1] = "-d"; + Args[2] = 0; + if(execvp(Args[0],(char **)Args)) + return(_error->Errno("decompressor","decompress failed")); + /* Should never get here */ + exit(100); + } + + // Wait for decompress to finish + if (ExecWait(Process,CompressProg.c_str(),false) == false) + return false; + + return true; +} + /*}}}*/ // IndexCopy::CopyPackages - Copy the package files from the CD /*{{{*/ // --------------------------------------------------------------------- /* */ @@ -61,7 +136,9 @@ bool IndexCopy::CopyPackages(string CDROM,string Name,vector<string> &List, { struct stat Buf; if (stat(string(*I + GetFileName()).c_str(),&Buf) != 0 && - stat(string(*I + GetFileName() + ".gz").c_str(),&Buf) != 0) + stat(string(*I + GetFileName() + ".gz").c_str(),&Buf) != 0 && + stat(string(*I + GetFileName() + ".xz").c_str(),&Buf) != 0 && + stat(string(*I + GetFileName() + ".bz2").c_str(),&Buf) != 0) return _error->Errno("stat","Stat failed for %s", string(*I + GetFileName()).c_str()); TotalSize += Buf.st_size; @@ -85,46 +162,14 @@ bool IndexCopy::CopyPackages(string CDROM,string Name,vector<string> &List, } else { - FileFd From(*I + GetFileName() + ".gz",FileFd::ReadOnly); - if (_error->PendingError() == true) - return false; - FileSize = From.Size(); - - // Get a temp file - FILE *tmp = tmpfile(); - if (tmp == 0) - return _error->Errno("tmpfile","Unable to create a tmp file"); - Pkg.Fd(dup(fileno(tmp))); - fclose(tmp); - - // Fork gzip - pid_t Process = fork(); - if (Process < 0) - return _error->Errno("fork","Couldn't fork gzip"); - - // The child - if (Process == 0) - { - dup2(From.Fd(),STDIN_FILENO); - dup2(Pkg.Fd(),STDOUT_FILENO); - SetCloseExec(STDIN_FILENO,false); - SetCloseExec(STDOUT_FILENO,false); - - const char *Args[3]; - string Tmp = _config->Find("Dir::bin::gzip","gzip"); - Args[0] = Tmp.c_str(); - Args[1] = "-d"; - Args[2] = 0; - execvp(Args[0],(char **)Args); - exit(100); - } - - // Wait for gzip to finish - if (ExecWait(Process,_config->Find("Dir::bin::gzip","gzip").c_str(),false) == false) - return _error->Error("gzip failed, perhaps the disk is full."); - + int fd; + if (!DecompressFile(string(*I + GetFileName()), &fd, &FileSize)) + return _error->Errno("decompress","Decompress failed for %s", + string(*I + GetFileName()).c_str()); + Pkg.Fd(dup(fd)); Pkg.Seek(0); } + pkgTagFile Parser(&Pkg); if (_error->PendingError() == true) return false; @@ -792,8 +837,11 @@ bool TranslationsCopy::CopyTranslations(string CDROM,string Name, /*{{{*/ for (vector<string>::iterator I = List.begin(); I != List.end(); ++I) { struct stat Buf; + if (stat(string(*I).c_str(),&Buf) != 0 && - stat(string(*I + ".gz").c_str(),&Buf) != 0) + stat(string(*I + ".gz").c_str(),&Buf) != 0 && + stat(string(*I + ".bz2").c_str(),&Buf) != 0 && + stat(string(*I + ".xz").c_str(),&Buf) != 0) return _error->Errno("stat","Stat failed for %s", string(*I).c_str()); TotalSize += Buf.st_size; @@ -817,44 +865,10 @@ bool TranslationsCopy::CopyTranslations(string CDROM,string Name, /*{{{*/ } else { - FileFd From(*I + ".gz",FileFd::ReadOnly); - if (_error->PendingError() == true) - return false; - FileSize = From.Size(); - - // Get a temp file - FILE *tmp = tmpfile(); - if (tmp == 0) - return _error->Errno("tmpfile","Unable to create a tmp file"); - Pkg.Fd(dup(fileno(tmp))); - fclose(tmp); - - // Fork gzip - pid_t Process = fork(); - if (Process < 0) - return _error->Errno("fork","Couldn't fork gzip"); - - // The child - if (Process == 0) - { - dup2(From.Fd(),STDIN_FILENO); - dup2(Pkg.Fd(),STDOUT_FILENO); - SetCloseExec(STDIN_FILENO,false); - SetCloseExec(STDOUT_FILENO,false); - - const char *Args[3]; - string Tmp = _config->Find("Dir::bin::gzip","gzip"); - Args[0] = Tmp.c_str(); - Args[1] = "-d"; - Args[2] = 0; - execvp(Args[0],(char **)Args); - exit(100); - } - - // Wait for gzip to finish - if (ExecWait(Process,_config->Find("Dir::bin::gzip","gzip").c_str(),false) == false) - return _error->Error("gzip failed, perhaps the disk is full."); - + int fd; + if (!DecompressFile(*I, &fd, &FileSize)) + return _error->Errno("decompress","Decompress failed for %s", (*I).c_str()); + Pkg.Fd(dup(fd)); Pkg.Seek(0); } pkgTagFile Parser(&Pkg); -- cgit v1.2.3-70-g09d2 From 1e67a553e86625052b140e9868c3b51759a71b1f Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Wed, 23 Nov 2011 19:48:07 +0100 Subject: fix another hickup in the changelog --- debian/changelog | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8b45cef39..f95edd60c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -33,6 +33,8 @@ apt (0.8.16~exp9) UNRELEASED; urgency=low apt (0.8.16~exp8) experimental; urgency=low [ David Kalnischkies ] + * algorithms.cc: + - show a debug why a package was kept by ResolveByKeep() * apt-pkg/packagemanager.cc: - do not fail on unpacked packages in SmartUnPack, just don't shedule them for unpack, but do all checks and configure them @@ -228,14 +230,6 @@ apt (0.8.16~exp1) experimental; urgency=low -- Michael Vogt <mvo@debian.org> Wed, 29 Jun 2011 12:40:31 +0200 -apt (1.8.15.9+nmu1) unstable; urgency=low - - [ David Kalnischkies ] - * algorithms.cc: - - show a debug why a package was kept by ResolveByKeep() - - -- David Kalnischkies <kalnischkies@gmail.com> Mon, 17 Oct 2011 16:36:22 +0200 - apt (0.8.15.9) unstable; urgency=low [ David Kalnischkies ] -- cgit v1.2.3-70-g09d2 From 78c9276d29172cbe72fc65ac56bde1627a8f86d1 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Thu, 24 Nov 2011 00:53:47 +0100 Subject: use getCompressors() instead of getCompressorTypes() and use it everywhere to replace hardcoding of compressiontypes and compressors --- apt-pkg/cdrom.cc | 125 ++++++++++++++++++++++--------------------- apt-pkg/indexcopy.cc | 146 +++++++++++++++++++++++++-------------------------- 2 files changed, 137 insertions(+), 134 deletions(-) diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc index 872879752..2c40c731d 100644 --- a/apt-pkg/cdrom.cc +++ b/apt-pkg/cdrom.cc @@ -82,66 +82,68 @@ bool pkgCdrom::FindPackages(string CD, /* Aha! We found some package files. We assume that everything under this dir is controlled by those package files so we don't look down anymore */ - std::vector<std::string> types = APT::Configuration::getCompressionTypes(); - types.push_back(""); - for (std::vector<std::string>::const_iterator t = types.begin(); - t != types.end(); ++t) - { - std::string filename = std::string("Packages"); - if ((*t).size() > 0) - filename.append("."+*t); - if (stat(filename.c_str(), &Buf) == 0) - { - List.push_back(CD); - - // Continue down if thorough is given - if (_config->FindB("APT::CDROM::Thorough",false) == false) - return true; - break; - } - } - for (std::vector<std::string>::const_iterator t = types.begin(); - t != types.end(); ++t) - { - std::string filename = std::string("Sources"); - if ((*t).size() > 0) - filename.append("."+*t); - { - SList.push_back(CD); - - // Continue down if thorough is given - if (_config->FindB("APT::CDROM::Thorough",false) == false) - return true; - break; - } - } + std::vector<APT::Configuration::Compressor> const compressor = APT::Configuration::getCompressors(); + for (std::vector<APT::Configuration::Compressor>::const_iterator c = compressor.begin(); + c != compressor.end(); ++c) + { + if (stat(std::string("Packages").append(c->Extension).c_str(), &Buf) != 0) + continue; + + if (_config->FindB("Debug::aptcdrom",false) == true) + std::clog << "Found Packages in " << CD << std::endl; + List.push_back(CD); + + // Continue down if thorough is given + if (_config->FindB("APT::CDROM::Thorough",false) == false) + return true; + break; + } + for (std::vector<APT::Configuration::Compressor>::const_iterator c = compressor.begin(); + c != compressor.end(); ++c) + { + if (stat(std::string("Sources").append(c->Extension).c_str(), &Buf) != 0) + continue; + + if (_config->FindB("Debug::aptcdrom",false) == true) + std::clog << "Found Sources in " << CD << std::endl; + SList.push_back(CD); + + // Continue down if thorough is given + if (_config->FindB("APT::CDROM::Thorough",false) == false) + return true; + break; + } // see if we find translation indices - if (stat("i18n",&Buf) == 0) + if (DirectoryExists("i18n") == true) { D = opendir("i18n"); for (struct dirent *Dir = readdir(D); Dir != 0; Dir = readdir(D)) { - if(strstr(Dir->d_name,"Translation") != NULL) + if(strncmp(Dir->d_name, "Translation-", strlen("Translation-")) != 0) + continue; + string file = Dir->d_name; + for (std::vector<APT::Configuration::Compressor>::const_iterator c = compressor.begin(); + c != compressor.end(); ++c) { - if (_config->FindB("Debug::aptcdrom",false) == true) - std::clog << "found translations: " << Dir->d_name << "\n"; - string file = Dir->d_name; - for (std::vector<std::string>::const_iterator t = types.begin(); - t != types.end(); ++t) - { - std::string needle = "." + *t; - if(file.substr(file.size()-needle.size()) == needle) - file = file.substr(0, file.size()-needle.size()); - TransList.push_back(CD+"i18n/"+ file); - break; - } + string fileext = flExtension(file); + if (file == fileext) + fileext.clear(); + else if (fileext.empty() == false) + fileext = "." + fileext; + + if (c->Extension == fileext) + { + if (_config->FindB("Debug::aptcdrom",false) == true) + std::clog << "Found translation " << Dir->d_name << " in " << CD << "i18n/" << std::endl; + TransList.push_back(CD + "i18n/" + file); + break; + } } } closedir(D); } - D = opendir("."); if (D == 0) return _error->Errno("opendir","Unable to read %s",CD.c_str()); @@ -278,24 +280,27 @@ bool pkgCdrom::DropRepeats(vector<string> &List,const char *Name) { // Get a list of all the inodes ino_t *Inodes = new ino_t[List.size()]; - for (unsigned int I = 0; I != List.size(); I++) + for (unsigned int I = 0; I != List.size(); ++I) { struct stat Buf; - std::vector<std::string> types = APT::Configuration::getCompressionTypes(); - types.push_back(""); - for (std::vector<std::string>::const_iterator t = types.begin(); - t != types.end(); ++t) + bool found = false; + + std::vector<APT::Configuration::Compressor> const compressor = APT::Configuration::getCompressors(); + for (std::vector<APT::Configuration::Compressor>::const_iterator c = compressor.begin(); + c != compressor.end(); ++c) { - std::string filename = List[I] + Name; - if ((*t).size() > 0) - filename.append("." + *t); + std::string filename = std::string(List[I]).append(Name).append(c->Extension); if (stat(filename.c_str(), &Buf) != 0) - _error->Errno("stat","Failed to stat %s%s",List[I].c_str(), - Name); - Inodes[I] = Buf.st_ino; + continue; + Inodes[I] = Buf.st_ino; + found = true; + break; } + + if (found == false) + _error->Errno("stat","Failed to stat %s%s",List[I].c_str(), Name); } - + if (_error->PendingError() == true) { delete[] Inodes; return false; diff --git a/apt-pkg/indexcopy.cc b/apt-pkg/indexcopy.cc index 84f9fd420..e38fe3e45 100644 --- a/apt-pkg/indexcopy.cc +++ b/apt-pkg/indexcopy.cc @@ -16,6 +16,7 @@ #include <apt-pkg/progress.h> #include <apt-pkg/strutl.h> #include <apt-pkg/fileutl.h> +#include <apt-pkg/aptconfiguration.h> #include <apt-pkg/configuration.h> #include <apt-pkg/tagfile.h> #include <apt-pkg/indexrecords.h> @@ -37,80 +38,62 @@ using namespace std; -// DecompressFile - wrapper for decompressing gzip/bzip2/xz compressed files /*{{{*/ +// DecompressFile - wrapper for decompressing compressed files /*{{{*/ // --------------------------------------------------------------------- /* */ bool DecompressFile(string Filename, int *fd, off_t *FileSize) { - string CompressProg; - string CompressProgFind; - FileFd From; struct stat Buf; - *fd = -1; + *fd = -1; - if (stat((Filename + ".gz").c_str(), &Buf) == 0) + std::vector<APT::Configuration::Compressor> const compressor = APT::Configuration::getCompressors(); + std::vector<APT::Configuration::Compressor>::const_iterator UnCompress; + std::string file = std::string(Filename).append(UnCompress->Extension); + for (UnCompress = compressor.begin(); UnCompress != compressor.end(); ++UnCompress) { - CompressProg = "gzip"; - CompressProgFind = "Dir::bin::gzip"; - From.Open(Filename + ".gz",FileFd::ReadOnly); + if (stat(file.c_str(), &Buf) == 0) + break; } - else if (stat((Filename + ".bz2").c_str(), &Buf) == 0) - { - CompressProg = "bzip2"; - CompressProgFind = "Dir::bin::bzip2"; - From.Open(Filename + ".bz2",FileFd::ReadOnly); - } - else if (stat((Filename + ".xz").c_str(), &Buf) == 0) - { - CompressProg = "xz"; - CompressProgFind = "Dir::bin::xz"; - From.Open(Filename + ".xz",FileFd::ReadOnly); - } - else - { + + if (UnCompress == compressor.end()) return _error->Errno("decompressor", "Unable to parse file"); - } - if (_error->PendingError() == true) - return -1; - *FileSize = Buf.st_size; - - // Get a temp file - FILE *tmp = tmpfile(); - if (tmp == 0) - return _error->Errno("tmpfile","Unable to create a tmp file"); - *fd = dup(fileno(tmp)); - fclose(tmp); - - // Fork decompressor - pid_t Process = fork(); - if (Process < 0) - return _error->Errno("fork","Couldn't fork to run decompressor"); - - // The child - if (Process == 0) - { - dup2(From.Fd(),STDIN_FILENO); - dup2(*fd,STDOUT_FILENO); - SetCloseExec(STDIN_FILENO,false); - SetCloseExec(STDOUT_FILENO,false); - - const char *Args[3]; - string Tmp = _config->Find(CompressProgFind, CompressProg); - Args[0] = Tmp.c_str(); - Args[1] = "-d"; - Args[2] = 0; - if(execvp(Args[0],(char **)Args)) - return(_error->Errno("decompressor","decompress failed")); - /* Should never get here */ - exit(100); + + // Create a data pipe + int Pipe[2] = {-1,-1}; + if (pipe(Pipe) != 0) + return _error->Errno("pipe",_("Failed to create subprocess IPC")); + for (int J = 0; J != 2; J++) + SetCloseExec(Pipe[J],true); + + *fd = Pipe[1]; + + // The child.. + pid_t Pid = ExecFork(); + if (Pid == 0) + { + dup2(Pipe[1],STDOUT_FILENO); + SetCloseExec(STDOUT_FILENO, false); + + std::vector<char const*> Args; + Args.push_back(UnCompress->Binary.c_str()); + for (std::vector<std::string>::const_iterator a = UnCompress->UncompressArgs.begin(); + a != UnCompress->UncompressArgs.end(); ++a) + Args.push_back(a->c_str()); + Args.push_back("--stdout"); + Args.push_back(file.c_str()); + Args.push_back(NULL); + + execvp(Args[0],(char **)&Args[0]); + cerr << _("Failed to exec compressor ") << Args[0] << endl; + _exit(100); } // Wait for decompress to finish - if (ExecWait(Process,CompressProg.c_str(),false) == false) + if (ExecWait(Pid, UnCompress->Binary.c_str(), false) == false) return false; - + return true; } /*}}}*/ @@ -132,17 +115,25 @@ bool IndexCopy::CopyPackages(string CDROM,string Name,vector<string> &List, // Prepare the progress indicator off_t TotalSize = 0; + std::vector<APT::Configuration::Compressor> const compressor = APT::Configuration::getCompressors(); for (vector<string>::iterator I = List.begin(); I != List.end(); ++I) { struct stat Buf; - if (stat(string(*I + GetFileName()).c_str(),&Buf) != 0 && - stat(string(*I + GetFileName() + ".gz").c_str(),&Buf) != 0 && - stat(string(*I + GetFileName() + ".xz").c_str(),&Buf) != 0 && - stat(string(*I + GetFileName() + ".bz2").c_str(),&Buf) != 0) - return _error->Errno("stat","Stat failed for %s", - string(*I + GetFileName()).c_str()); + bool found = false; + std::string file = std::string(*I).append(GetFileName()); + for (std::vector<APT::Configuration::Compressor>::const_iterator c = compressor.begin(); + c != compressor.end(); ++c) + { + if (stat(std::string(file + c->Extension).c_str(), &Buf) != 0) + continue; + found = true; + break; + } + + if (found == false) + return _error->Errno("stat", "Stat failed for %s", file.c_str()); TotalSize += Buf.st_size; - } + } off_t CurrentSize = 0; unsigned int NotFound = 0; @@ -834,18 +825,25 @@ bool TranslationsCopy::CopyTranslations(string CDROM,string Name, /*{{{*/ // Prepare the progress indicator off_t TotalSize = 0; + std::vector<APT::Configuration::Compressor> const compressor = APT::Configuration::getCompressors(); for (vector<string>::iterator I = List.begin(); I != List.end(); ++I) { struct stat Buf; - - if (stat(string(*I).c_str(),&Buf) != 0 && - stat(string(*I + ".gz").c_str(),&Buf) != 0 && - stat(string(*I + ".bz2").c_str(),&Buf) != 0 && - stat(string(*I + ".xz").c_str(),&Buf) != 0) - return _error->Errno("stat","Stat failed for %s", - string(*I).c_str()); + bool found = false; + std::string file = *I; + for (std::vector<APT::Configuration::Compressor>::const_iterator c = compressor.begin(); + c != compressor.end(); ++c) + { + if (stat(std::string(file + c->Extension).c_str(), &Buf) != 0) + continue; + found = true; + break; + } + + if (found == false) + return _error->Errno("stat", "Stat failed for %s", file.c_str()); TotalSize += Buf.st_size; - } + } off_t CurrentSize = 0; unsigned int NotFound = 0; -- cgit v1.2.3-70-g09d2 From 386566e36bedb453eb6f914e8e14fd555a2bf111 Mon Sep 17 00:00:00 2001 From: Michael Vogt <michael.vogt@ubuntu.com> Date: Mon, 28 Nov 2011 12:07:55 +0100 Subject: revert libapt-common addition because of http://lists.debian.org/debian-devel/2011/11/msg00742.html --- debian/control | 13 ++----------- debian/libapt-inst1.4.install.in | 1 + debian/libapt-pkg4.12.install.in | 1 + debian/rules | 19 +------------------ 4 files changed, 5 insertions(+), 29 deletions(-) diff --git a/debian/control b/debian/control index 24c429ad4..03d74c51f 100644 --- a/debian/control +++ b/debian/control @@ -35,20 +35,11 @@ Description: APT's commandline package manager * apt-config as an interface to the configuration settings * apt-key as an interface to manage authentication keys -Package: libapt-common -Architecture: all -Multi-Arch: foreign -Depends: ${misc:Depends} -Breaks: libapt-pkg4.12 (<< 0.8.16~exp9), libapt-inst1.4 (<< 0.8.16~exp9) -Replaces: libapt-pkg4.12 (<< 0.8.16~exp9), libapt-inst1.4 (<< 0.8.16~exp9) -Description: Common files for APT libraries - This package includes translation files common to APT library packages. - Package: libapt-pkg4.12 Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} -Depends: ${shlibs:Depends}, ${misc:Depends}, libapt-common +Depends: ${shlibs:Depends}, ${misc:Depends} Description: APT's package managment runtime library This library provides the common functionality for searching and managing packages as well as information about packages. @@ -69,7 +60,7 @@ Package: libapt-inst1.4 Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} -Depends: ${shlibs:Depends}, ${misc:Depends}, libapt-common +Depends: ${shlibs:Depends}, ${misc:Depends} Description: APT's deb package format runtime library This library provides methods to query and extract information from deb packages. This includes the control data and the package diff --git a/debian/libapt-inst1.4.install.in b/debian/libapt-inst1.4.install.in index b81d15c10..8bcce2c28 100644 --- a/debian/libapt-inst1.4.install.in +++ b/debian/libapt-inst1.4.install.in @@ -1 +1,2 @@ bin/libapt-inst*.so.* usr/lib/@DEB_HOST_MULTIARCH@/ +usr/share/locale/*/*/libapt-inst*.mo diff --git a/debian/libapt-pkg4.12.install.in b/debian/libapt-pkg4.12.install.in index 0db4075fa..56bed39d3 100644 --- a/debian/libapt-pkg4.12.install.in +++ b/debian/libapt-pkg4.12.install.in @@ -1 +1,2 @@ bin/libapt-pkg*.so.* usr/lib/@DEB_HOST_MULTIARCH@/ +usr/share/locale/*/*/libapt-pkg*.mo diff --git a/debian/rules b/debian/rules index 6a5c95d22..4ef5bb47a 100755 --- a/debian/rules +++ b/debian/rules @@ -125,25 +125,8 @@ clean: debian/%.install: debian/%.install.in sed 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' $< > $@ -binary-indep: libapt-common apt-doc libapt-pkg-doc +binary-indep: apt-doc libapt-pkg-doc # Build architecture-independent files here. -libapt-common: build - dh_testdir -p$@ - dh_testroot -p$@ - dh_prep -p$@ - dh_installdirs -p$@ - - dh_install -p$@ --sourcedir=$(BLD) - dh_installdocs -p$@ - dh_installchangelogs -p$@ - dh_strip -p$@ - dh_compress -p$@ - dh_fixperms -p$@ - dh_installdeb -p$@ - dh_gencontrol -p$@ - dh_md5sums -p$@ - dh_builddeb -p$@ - libapt-pkg-doc: build-doc dh_testdir -p$@ dh_testroot -p$@ -- cgit v1.2.3-70-g09d2 From 257e8d668c044fb0e9ad8e4b53afd32e07404831 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Tue, 29 Nov 2011 12:14:31 +0100 Subject: split up the OpenMode into OpenMode and CompressionMode and provide ReadOnly, WriteOnly and ReadWrite as flags alongside the additional flags as decompression will be one-way later, but certain parts really depend on Write* openmodes being ReadWrite opens, so we will have to fail for those. --- apt-pkg/contrib/fileutl.cc | 102 +++++++++++++++++++++++---------------------- apt-pkg/contrib/fileutl.h | 30 +++++++++++-- 2 files changed, 79 insertions(+), 53 deletions(-) diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index 95058cbde..d5e7192e3 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -718,69 +718,72 @@ bool ExecWait(pid_t Pid,const char *Name,bool Reap) // FileFd::Open - Open a file /*{{{*/ // --------------------------------------------------------------------- /* The most commonly used open mode combinations are given with Mode */ -bool FileFd::Open(string FileName,OpenMode Mode, unsigned long Perms) +bool FileFd::Open(string FileName,OpenMode Mode,CompressMode Compress, unsigned long Perms) { + if (Mode == ReadOnlyGzip) + return Open(FileName, ReadOnly, Gzip, Perms); Close(); Flags = AutoClose; - switch (Mode) + + int fileflags = 0; +#define if_FLAGGED_SET(FLAG, MODE) if ((Mode & FLAG) == FLAG) fileflags |= MODE + if_FLAGGED_SET(ReadWrite, O_RDWR); + else if_FLAGGED_SET(ReadOnly, O_RDONLY); + else if_FLAGGED_SET(WriteOnly, O_WRONLY); + else return _error->Error("No openmode provided in FileFd::Open for %s", FileName.c_str()); + + if_FLAGGED_SET(Create, O_CREAT); + if_FLAGGED_SET(Exclusive, O_EXCL); + else if_FLAGGED_SET(Atomic, O_EXCL); + if_FLAGGED_SET(Empty, O_TRUNC); +#undef if_FLAGGED_SET + + if ((Mode & Atomic) == Atomic) + { + Flags |= Replace; + char *name = strdup((FileName + ".XXXXXX").c_str()); + TemporaryFileName = string(mktemp(name)); + free(name); + } + else if ((Mode & (Exclusive | Create)) == (Exclusive | Create)) + { + // for atomic, this will be done by rename in Close() + unlink(FileName.c_str()); + } + if ((Mode & Empty) == Empty) { - case ReadOnly: - iFd = open(FileName.c_str(),O_RDONLY); - break; + struct stat Buf; + if (lstat(FileName.c_str(),&Buf) == 0 && S_ISLNK(Buf.st_mode)) + unlink(FileName.c_str()); + } - case ReadOnlyGzip: - iFd = open(FileName.c_str(),O_RDONLY); - if (iFd > 0) { - gz = gzdopen (iFd, "r"); - if (gz == NULL) { - close (iFd); - iFd = -1; - } - } - break; - - case WriteAtomic: - { - Flags |= Replace; - char *name = strdup((FileName + ".XXXXXX").c_str()); - TemporaryFileName = string(mktemp(name)); - iFd = open(TemporaryFileName.c_str(),O_RDWR | O_CREAT | O_EXCL,Perms); - free(name); - break; - } + if (TemporaryFileName.empty() == false) + iFd = open(TemporaryFileName.c_str(), fileflags, Perms); + else + iFd = open(FileName.c_str(), fileflags, Perms); - case WriteEmpty: + if (iFd != -1 && Compress == Gzip) + { + gz = gzdopen (iFd, "r"); + if (gz == NULL) { - struct stat Buf; - if (lstat(FileName.c_str(),&Buf) == 0 && S_ISLNK(Buf.st_mode)) - unlink(FileName.c_str()); - iFd = open(FileName.c_str(),O_RDWR | O_CREAT | O_TRUNC,Perms); - break; + close (iFd); + iFd = -1; } - - case WriteExists: - iFd = open(FileName.c_str(),O_RDWR); - break; - - case WriteAny: - iFd = open(FileName.c_str(),O_RDWR | O_CREAT,Perms); - break; - - case WriteTemp: - unlink(FileName.c_str()); - iFd = open(FileName.c_str(),O_RDWR | O_CREAT | O_EXCL,Perms); - break; - } + } - if (iFd < 0) + if (iFd == -1) return _error->Errno("open",_("Could not open file %s"),FileName.c_str()); - + this->FileName = FileName; SetCloseExec(iFd,true); return true; } - -bool FileFd::OpenDescriptor(int Fd, OpenMode Mode, bool AutoClose) + /*}}}*/ +// FileFd::OpenDescriptor - Open a filedescriptor /*{{{*/ +// --------------------------------------------------------------------- +/* */ +bool FileFd::OpenDescriptor(int Fd, OpenMode Mode, CompressMode Compress, bool AutoClose) { Close(); Flags = (AutoClose) ? FileFd::AutoClose : 0; @@ -1031,6 +1034,7 @@ bool FileFd::Close() Res &= _error->Errno("rename",_("Problem renaming the file %s to %s"), TemporaryFileName.c_str(), FileName.c_str()); FileName = TemporaryFileName; // for the unlink() below. + TemporaryFileName.clear(); } iFd = -1; diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h index 0d0451a46..fa8f92272 100644 --- a/apt-pkg/contrib/fileutl.h +++ b/apt-pkg/contrib/fileutl.h @@ -44,8 +44,24 @@ class FileFd gzFile gz; public: - enum OpenMode {ReadOnly,WriteEmpty,WriteExists,WriteAny,WriteTemp,ReadOnlyGzip, - WriteAtomic}; + enum OpenMode { + ReadOnly = (1 << 0), + WriteOnly = (1 << 1), + ReadWrite = ReadOnly | WriteOnly, + + Create = (1 << 2), + Exclusive = (1 << 3), + Atomic = Exclusive | (1 << 4), + Empty = (1 << 5), + + WriteEmpty = ReadWrite | Create | Empty, + WriteExists = ReadWrite, + WriteAny = ReadWrite | Create, + WriteTemp = ReadWrite | Create | Exclusive, + ReadOnlyGzip, + WriteAtomic = ReadWrite | Create | Atomic + }; + enum CompressMode { Auto, None, Gzip, Bzip2, Lzma, Xz }; inline bool Read(void *To,unsigned long long Size,bool AllowEof) { @@ -77,8 +93,14 @@ class FileFd return T; } - bool Open(std::string FileName,OpenMode Mode,unsigned long Perms = 0666); - bool OpenDescriptor(int Fd, OpenMode Mode, bool AutoClose=false); + bool Open(std::string FileName,OpenMode Mode,CompressMode Compress,unsigned long Perms = 0666); + inline bool Open(std::string const &FileName,OpenMode Mode,unsigned long Perms = 0666) { + return Open(FileName, Mode, None, Perms); + }; + bool OpenDescriptor(int Fd, OpenMode Mode, CompressMode Compress, bool AutoClose=false); + inline bool OpenDescriptor(int Fd, OpenMode Mode, bool AutoClose=false) { + return OpenDescriptor(Fd, Mode, None, AutoClose); + }; bool Close(); bool Sync(); -- cgit v1.2.3-70-g09d2 From a7e052eae64486a31595bc9b3f4a1c02c13256e3 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Wed, 30 Nov 2011 16:37:09 +0100 Subject: ensure that we exit instead of proceed in execution after the trap (the execution leads to hard failures anyway) --- test/integration/framework | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration/framework b/test/integration/framework index b55f793a4..2ea1844f0 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -102,7 +102,7 @@ aptitude() { addtrap() { CURRENTTRAP="$CURRENTTRAP $1" - trap "$CURRENTTRAP" 0 HUP INT QUIT ILL ABRT FPE SEGV PIPE TERM + trap "$CURRENTTRAP exit;" 0 HUP INT QUIT ILL ABRT FPE SEGV PIPE TERM } setupenvironment() { -- cgit v1.2.3-70-g09d2 From 81094782d705852dd12d0c4a1fa60f538906cb77 Mon Sep 17 00:00:00 2001 From: "Michael Basse (michael-alpha-unix)" <> Date: Tue, 6 Dec 2011 16:56:10 +0100 Subject: * doc/po/de.po: - apply typo-fix from Michael Basse, thanks! (LP: #900770) --- debian/changelog | 4 +++- doc/po/de.po | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3cd6aa410..7468c872c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,13 +5,15 @@ apt (0.8.15.10) unstable; urgency=low - show a debug why a package was kept by ResolveByKeep() * doc/manpage-style.xml: - put <brackets> around email addresses + * doc/po/de.po: + - apply typo-fix from Michael Basse, thanks! (LP: #900770) [ Chris Leick ] * German manpage translation update * doc/*.xml: - find and fix a bunch of misspellings - -- David Kalnischkies <kalnischkies@gmail.com> Sun, 20 Nov 2011 18:02:08 +0100 + -- David Kalnischkies <kalnischkies@gmail.com> Tue, 06 Dec 2011 16:35:39 +0100 apt (0.8.15.9) unstable; urgency=low diff --git a/doc/po/de.po b/doc/po/de.po index 5b5366ed4..96d7f054a 100644 --- a/doc/po/de.po +++ b/doc/po/de.po @@ -3965,7 +3965,7 @@ msgid "" "Download only; package files are only retrieved, not unpacked or installed. " "Configuration Item: <literal>APT::Get::Download-Only</literal>." msgstr "" -"Nur herunterladen; Paketdateien werde nur heruntergeladen, nicht entpackt " +"Nur herunterladen; Paketdateien werden nur heruntergeladen, nicht entpackt " "oder installiert. Konfigurationselement: <literal>APT::Get::Download-Only</" "literal>." -- cgit v1.2.3-70-g09d2 From 8e16d8c39447809506a8cd8e6f88cae3c168f82d Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sat, 10 Dec 2011 17:35:54 +0100 Subject: * cmdline/apt-config.cc: - dump the APT::Compressor settings correctly and completely --- cmdline/apt-config.cc | 16 ++++++++++++++++ debian/changelog | 11 +++++++---- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/cmdline/apt-config.cc b/cmdline/apt-config.cc index 94f6ee9b0..47bedfe3f 100644 --- a/cmdline/apt-config.cc +++ b/cmdline/apt-config.cc @@ -134,6 +134,22 @@ int main(int argc,const char *argv[]) /*{{{*/ for (std::vector<std::string>::const_iterator a = archs.begin(); a != archs.end(); ++a) _config->Set("APT::Architectures::", *a); + std::vector<APT::Configuration::Compressor> const compressors = APT::Configuration::getCompressors(); + _config->Clear("APT::Compressor"); + string conf = "APT::Compressor::"; + for (std::vector<APT::Configuration::Compressor>::const_iterator c = compressors.begin(); c != compressors.end(); ++c) + { + string comp = conf + c->Name + "::"; + _config->Set(comp + "Name", c->Name); + _config->Set(comp + "Extension", c->Extension); + _config->Set(comp + "Binary", c->Binary); + _config->Set(std::string(comp + "Cost").c_str(), c->Cost); + for (std::vector<std::string>::const_iterator a = c->CompressArgs.begin(); a != c->CompressArgs.end(); ++a) + _config->Set(comp + "CompressArg::", *a); + for (std::vector<std::string>::const_iterator a = c->UncompressArgs.begin(); a != c->UncompressArgs.end(); ++a) + _config->Set(comp + "UncompressArg::", *a); + } + // Match the operation CmdL.DispatchArg(Cmds); diff --git a/debian/changelog b/debian/changelog index f95edd60c..685774a8f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,16 +1,17 @@ + apt (0.8.16~exp9) UNRELEASED; urgency=low [ Julian Andres Klode ] * apt-pkg/cdrom.cc: - Accept .bz2, .xz files in addition to .gz files (Closes: #649451) - + [ Michael Vogt ] * apt-pkg/cdrom.cc: - use aptconfiguration to get the supported compression types * debian/control: - bump debhelper build-dep to debhelper (>= 8.1.3~) - set libapt-pkg-dev to multi-arch: same too - + [ Colin Watson ] * Convert libapt-pkg4.12 and libapt-inst1.4 to Multi-Arch: same. @@ -27,8 +28,10 @@ apt (0.8.16~exp9) UNRELEASED; urgency=low * cmdline/apt-get.cc: - ignore foreign architectures if we check if a provides has only one resolver as it's basically the same for the user, so no need to choose - - -- Julian Andres Klode <jak@debian.org> Mon, 21 Nov 2011 18:46:36 +0100 + * cmdline/apt-config.cc: + - dump the APT::Compressor settings correctly and completely + + -- David Kalnischkies <kalnischkies@gmail.com> Sat, 10 Dec 2011 17:34:50 +0100 apt (0.8.16~exp8) experimental; urgency=low -- cgit v1.2.3-70-g09d2 From 468720c59fcf48b20332cdb7b601b2b0d7cbbfbb Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sat, 10 Dec 2011 19:31:36 +0100 Subject: enable FileFd to guess the compressor based on the filename if requested or to search for compressed silbings of the given filename and use this guessing instead of hardcoding Gzip compression --- apt-pkg/contrib/fileutl.cc | 129 ++++++++++++++++++++++++++++++++++++++------ apt-pkg/contrib/fileutl.h | 14 +++-- apt-pkg/deb/debindexfile.cc | 13 ++--- apt-pkg/deb/debrecords.cc | 2 +- apt-pkg/deb/debsrcrecords.h | 2 +- cmdline/apt-cache.cc | 2 +- methods/gzip.cc | 2 +- methods/rred.cc | 2 +- 8 files changed, 135 insertions(+), 31 deletions(-) diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index d5e7192e3..1cb3fab1e 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -24,6 +24,7 @@ #include <apt-pkg/strutl.h> #include <apt-pkg/error.h> #include <apt-pkg/sptr.h> +#include <apt-pkg/aptconfiguration.h> #include <apt-pkg/configuration.h> #include <cstdlib> @@ -725,6 +726,11 @@ bool FileFd::Open(string FileName,OpenMode Mode,CompressMode Compress, unsigned Close(); Flags = AutoClose; + if (Compress == Auto && (Mode & WriteOnly) == WriteOnly) + return _error->Error("Autodetection on %s only works in ReadOnly openmode!", FileName.c_str()); + if ((Mode & WriteOnly) != WriteOnly && (Mode & (Atomic | Create | Empty | Exclusive)) != 0) + return _error->Error("ReadOnly mode for %s doesn't accept additional flags!", FileName.c_str()); + int fileflags = 0; #define if_FLAGGED_SET(FLAG, MODE) if ((Mode & FLAG) == FLAG) fileflags |= MODE if_FLAGGED_SET(ReadWrite, O_RDWR); @@ -738,6 +744,70 @@ bool FileFd::Open(string FileName,OpenMode Mode,CompressMode Compress, unsigned if_FLAGGED_SET(Empty, O_TRUNC); #undef if_FLAGGED_SET + // FIXME: Denote inbuilt compressors somehow - as we don't need to have the binaries for them + std::vector<APT::Configuration::Compressor> const compressors = APT::Configuration::getCompressors(); + std::vector<APT::Configuration::Compressor>::const_iterator compressor = compressors.begin(); + if (Compress == Auto) + { + Compress = None; + for (; compressor != compressors.end(); ++compressor) + { + std::string file = std::string(FileName).append(compressor->Extension); + if (FileExists(file) == false) + continue; + FileName = file; + if (compressor->Binary == ".") + Compress = None; + else + Compress = Extension; + break; + } + } + else if (Compress == Extension) + { + Compress = None; + std::string ext = flExtension(FileName); + if (ext != FileName) + { + ext = "." + ext; + for (; compressor != compressors.end(); ++compressor) + if (ext == compressor->Extension) + break; + } + } + else if (Compress != None) + { + std::string name; + switch (Compress) + { + case Gzip: name = "gzip"; break; + case Bzip2: name = "bzip2"; break; + case Lzma: name = "lzma"; break; + case Xz: name = "xz"; break; + default: return _error->Error("Can't find a match for specified compressor mode for file %s", FileName.c_str()); + } + for (; compressor != compressors.end(); ++compressor) + if (compressor->Name == name) + break; + if (compressor == compressors.end() && name != "gzip") + return _error->Error("Can't find a configured compressor %s for file %s", name.c_str(), FileName.c_str()); + } + + // if we have them, use inbuilt compressors instead of forking + if (compressor != compressors.end()) + { + if (compressor->Name == "gzip") + { + Compress = Gzip; + compressor = compressors.end(); + } + else if (compressor->Name == "." || Compress == None) + { + Compress = None; + compressor = compressors.end(); + } + } + if ((Mode & Atomic) == Atomic) { Flags |= Replace; @@ -757,18 +827,27 @@ bool FileFd::Open(string FileName,OpenMode Mode,CompressMode Compress, unsigned unlink(FileName.c_str()); } - if (TemporaryFileName.empty() == false) - iFd = open(TemporaryFileName.c_str(), fileflags, Perms); - else - iFd = open(FileName.c_str(), fileflags, Perms); + if (compressor != compressors.end()) + { + if ((Mode & ReadWrite) == ReadWrite) + _error->Error("External compressors like %s do not support readwrite mode for file %s", compressor->Name.c_str(), FileName.c_str()); - if (iFd != -1 && Compress == Gzip) + _error->Error("Forking external compressor %s is not implemented for %s", compressor->Name.c_str(), FileName.c_str()); + } + else { - gz = gzdopen (iFd, "r"); - if (gz == NULL) + if (TemporaryFileName.empty() == false) + iFd = open(TemporaryFileName.c_str(), fileflags, Perms); + else + iFd = open(FileName.c_str(), fileflags, Perms); + + if (iFd != -1) { - close (iFd); - iFd = -1; + if (OpenInternDescriptor(Mode, Compress) == false) + { + close (iFd); + iFd = -1; + } } } @@ -788,17 +867,33 @@ bool FileFd::OpenDescriptor(int Fd, OpenMode Mode, CompressMode Compress, bool A Close(); Flags = (AutoClose) ? FileFd::AutoClose : 0; iFd = Fd; - if (Mode == ReadOnlyGzip) { - gz = gzdopen (iFd, "r"); - if (gz == NULL) { - if (AutoClose) - close (iFd); - return _error->Errno("gzdopen",_("Could not open file descriptor %d"), - Fd); - } + if (OpenInternDescriptor(Mode, Compress) == false) + { + if (AutoClose) + close (iFd); + return _error->Errno("gzdopen",_("Could not open file descriptor %d"), Fd); } this->FileName = ""; return true; +} +bool FileFd::OpenInternDescriptor(OpenMode Mode, CompressMode Compress) +{ + if (Compress == None) + return true; + else if (Compress == Gzip) + { + if ((Mode & ReadWrite) == ReadWrite) + gz = gzdopen(iFd, "r+"); + else if ((Mode & WriteOnly) == WriteOnly) + gz = gzdopen(iFd, "w"); + else + gz = gzdopen (iFd, "r"); + if (gz == NULL) + return false; + } + else + return false; + return true; } /*}}}*/ // FileFd::~File - Closes the file /*{{{*/ diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h index fa8f92272..59a9d97e3 100644 --- a/apt-pkg/contrib/fileutl.h +++ b/apt-pkg/contrib/fileutl.h @@ -61,7 +61,7 @@ class FileFd ReadOnlyGzip, WriteAtomic = ReadWrite | Create | Atomic }; - enum CompressMode { Auto, None, Gzip, Bzip2, Lzma, Xz }; + enum CompressMode { Auto = 'A', None = 'N', Extension = 'E', Gzip = 'G', Bzip2 = 'B', Lzma = 'L', Xz = 'X' }; inline bool Read(void *To,unsigned long long Size,bool AllowEof) { @@ -94,7 +94,7 @@ class FileFd } bool Open(std::string FileName,OpenMode Mode,CompressMode Compress,unsigned long Perms = 0666); - inline bool Open(std::string const &FileName,OpenMode Mode,unsigned long Perms = 0666) { + inline bool Open(std::string const &FileName,OpenMode Mode, unsigned long Perms = 0666) { return Open(FileName, Mode, None, Perms); }; bool OpenDescriptor(int Fd, OpenMode Mode, CompressMode Compress, bool AutoClose=false); @@ -118,11 +118,19 @@ class FileFd FileFd(std::string FileName,OpenMode Mode,unsigned long Perms = 0666) : iFd(-1), Flags(0), gz(NULL) { - Open(FileName,Mode,Perms); + Open(FileName,Mode, None, Perms); + }; + FileFd(std::string FileName,OpenMode Mode, CompressMode Compress, unsigned long Perms = 0666) : + iFd(-1), Flags(0), gz(NULL) + { + Open(FileName,Mode, Compress, Perms); }; FileFd(int Fd = -1) : iFd(Fd), Flags(AutoClose), gz(NULL) {}; FileFd(int Fd,bool) : iFd(Fd), Flags(0), gz(NULL) {}; virtual ~FileFd(); + + private: + bool OpenInternDescriptor(OpenMode Mode, CompressMode Compress); }; bool RunScripts(const char *Cnf); diff --git a/apt-pkg/deb/debindexfile.cc b/apt-pkg/deb/debindexfile.cc index 27c1f7f32..d9c448598 100644 --- a/apt-pkg/deb/debindexfile.cc +++ b/apt-pkg/deb/debindexfile.cc @@ -159,7 +159,7 @@ unsigned long debSourcesIndex::Size() const /* we need to ignore errors here; if the lists are absent, just return 0 */ _error->PushToStack(); - FileFd f = FileFd (IndexFile("Sources"), FileFd::ReadOnlyGzip); + FileFd f = FileFd (IndexFile("Sources"), FileFd::ReadOnly, FileFd::Extension); if (!f.Failed()) size = f.Size(); @@ -288,7 +288,7 @@ unsigned long debPackagesIndex::Size() const /* we need to ignore errors here; if the lists are absent, just return 0 */ _error->PushToStack(); - FileFd f = FileFd (IndexFile("Packages"), FileFd::ReadOnlyGzip); + FileFd f = FileFd (IndexFile("Packages"), FileFd::ReadOnly, FileFd::Extension); if (!f.Failed()) size = f.Size(); @@ -305,7 +305,7 @@ unsigned long debPackagesIndex::Size() const bool debPackagesIndex::Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const { string PackageFile = IndexFile("Packages"); - FileFd Pkg(PackageFile,FileFd::ReadOnlyGzip); + FileFd Pkg(PackageFile,FileFd::ReadOnly, FileFd::Extension); debListParser Parser(&Pkg, Architecture); if (_error->PendingError() == true) @@ -319,6 +319,7 @@ bool debPackagesIndex::Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const // Store the IMS information pkgCache::PkgFileIterator File = Gen.GetCurFile(); pkgCacheGenerator::Dynamic<pkgCache::PkgFileIterator> DynFile(File); + // FIXME: Get this info from FileFd instead struct stat St; if (fstat(Pkg.Fd(),&St) != 0) return _error->Errno("fstat","Failed to stat"); @@ -489,7 +490,7 @@ unsigned long debTranslationsIndex::Size() const /* we need to ignore errors here; if the lists are absent, just return 0 */ _error->PushToStack(); - FileFd f = FileFd (IndexFile(Language), FileFd::ReadOnlyGzip); + FileFd f = FileFd (IndexFile(Language), FileFd::ReadOnly, FileFd::Extension); if (!f.Failed()) size = f.Size(); @@ -509,7 +510,7 @@ bool debTranslationsIndex::Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const string TranslationFile = IndexFile(Language); if (FileExists(TranslationFile)) { - FileFd Trans(TranslationFile,FileFd::ReadOnlyGzip); + FileFd Trans(TranslationFile,FileFd::ReadOnly, FileFd::Extension); debListParser TransParser(&Trans); if (_error->PendingError() == true) return false; @@ -590,7 +591,7 @@ unsigned long debStatusIndex::Size() const /* */ bool debStatusIndex::Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const { - FileFd Pkg(File,FileFd::ReadOnlyGzip); + FileFd Pkg(File,FileFd::ReadOnly, FileFd::Extension); if (_error->PendingError() == true) return false; debListParser Parser(&Pkg); diff --git a/apt-pkg/deb/debrecords.cc b/apt-pkg/deb/debrecords.cc index 1afa7b74d..184c07c33 100644 --- a/apt-pkg/deb/debrecords.cc +++ b/apt-pkg/deb/debrecords.cc @@ -25,7 +25,7 @@ using std::string; // --------------------------------------------------------------------- /* */ debRecordParser::debRecordParser(string FileName,pkgCache &Cache) : - File(FileName,FileFd::ReadOnlyGzip), + File(FileName,FileFd::ReadOnly, FileFd::Extension), Tags(&File, std::max(Cache.Head().MaxVerFileSize, Cache.Head().MaxDescFileSize) + 200) { diff --git a/apt-pkg/deb/debsrcrecords.h b/apt-pkg/deb/debsrcrecords.h index 4c8d03224..5d2a67f4f 100644 --- a/apt-pkg/deb/debsrcrecords.h +++ b/apt-pkg/deb/debsrcrecords.h @@ -50,7 +50,7 @@ class debSrcRecordParser : public pkgSrcRecords::Parser virtual bool Files(std::vector<pkgSrcRecords::File> &F); debSrcRecordParser(std::string const &File,pkgIndexFile const *Index) - : Parser(Index), Fd(File,FileFd::ReadOnlyGzip), Tags(&Fd,102400), + : Parser(Index), Fd(File,FileFd::ReadOnly, FileFd::Extension), Tags(&Fd,102400), Buffer(NULL) {} virtual ~debSrcRecordParser(); }; diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index 65d7b0ccd..1cd5080cc 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -1143,7 +1143,7 @@ bool DisplayRecord(pkgCacheFile &CacheFile, pkgCache::VerIterator V) return _error->Error(_("Package file %s is out of sync."),I.FileName()); FileFd PkgF; - if (PkgF.Open(I.FileName(), FileFd::ReadOnlyGzip) == false) + if (PkgF.Open(I.FileName(), FileFd::ReadOnly, FileFd::Extension) == false) return false; // Read the record diff --git a/methods/gzip.cc b/methods/gzip.cc index a51497948..6ab6548ef 100644 --- a/methods/gzip.cc +++ b/methods/gzip.cc @@ -48,7 +48,7 @@ bool GzipMethod::Fetch(FetchItem *Itm) URIStart(Res); // Open the source and destination files - FileFd From(Path,FileFd::ReadOnlyGzip); + FileFd From(Path,FileFd::ReadOnly, FileFd::Gzip); if(From.FileSize() == 0) return _error->Error(_("Empty files can't be valid archives")); diff --git a/methods/rred.cc b/methods/rred.cc index ef00fcaa3..56ad8220b 100644 --- a/methods/rred.cc +++ b/methods/rred.cc @@ -489,7 +489,7 @@ bool RredMethod::Fetch(FetchItem *Itm) /*{{{*/ // Open the source and destination files (the d'tor of FileFd will do // the cleanup/closing of the fds) FileFd From(Path,FileFd::ReadOnly); - FileFd Patch(Path+".ed",FileFd::ReadOnlyGzip); + FileFd Patch(Path+".ed",FileFd::ReadOnly, FileFd::Gzip); FileFd To(Itm->DestFile,FileFd::WriteAtomic); To.EraseOnFailure(); if (_error->PendingError() == true) -- cgit v1.2.3-70-g09d2 From 76a763e1f842543a53bc28db681d963d0fc4ae12 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sat, 10 Dec 2011 20:03:49 +0100 Subject: * apt-pkg/contrib/fileutl.{h,cc}: - implement a ModificationTime method for FileFd --- apt-pkg/contrib/fileutl.cc | 14 ++++++++++++++ apt-pkg/contrib/fileutl.h | 1 + apt-pkg/deb/debindexfile.cc | 19 ++++++------------- apt-pkg/edsp/edspindexfile.cc | 7 ++----- debian/changelog | 5 +++-- 5 files changed, 26 insertions(+), 20 deletions(-) diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index 1cb3fab1e..83b68e796 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -1106,6 +1106,20 @@ unsigned long long FileFd::Size() return size; } /*}}}*/ +// FileFd::ModificationTime - Return the time of last touch /*{{{*/ +// --------------------------------------------------------------------- +/* */ +time_t FileFd::ModificationTime() +{ + struct stat Buf; + if (fstat(iFd,&Buf) != 0) + { + _error->Errno("fstat","Unable to determine the modification time of file %s", FileName.c_str()); + return 0; + } + return Buf.st_mtime; +} + /*}}}*/ // FileFd::Close - Close the file if the close flag is set /*{{{*/ // --------------------------------------------------------------------- /* */ diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h index 59a9d97e3..8f2d7a0a0 100644 --- a/apt-pkg/contrib/fileutl.h +++ b/apt-pkg/contrib/fileutl.h @@ -78,6 +78,7 @@ class FileFd unsigned long long Tell(); unsigned long long Size(); unsigned long long FileSize(); + time_t ModificationTime(); /* You want to use 'unsigned long long' if you are talking about a file to be able to support large files (>2 or >4 GB) properly. diff --git a/apt-pkg/deb/debindexfile.cc b/apt-pkg/deb/debindexfile.cc index d9c448598..2635d52c8 100644 --- a/apt-pkg/deb/debindexfile.cc +++ b/apt-pkg/deb/debindexfile.cc @@ -319,12 +319,8 @@ bool debPackagesIndex::Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const // Store the IMS information pkgCache::PkgFileIterator File = Gen.GetCurFile(); pkgCacheGenerator::Dynamic<pkgCache::PkgFileIterator> DynFile(File); - // FIXME: Get this info from FileFd instead - struct stat St; - if (fstat(Pkg.Fd(),&St) != 0) - return _error->Errno("fstat","Failed to stat"); - File->Size = St.st_size; - File->mtime = St.st_mtime; + File->Size = Pkg.FileSize(); + File->mtime = Pkg.ModificationTime(); if (Gen.MergeList(Parser) == false) return _error->Error("Problem with MergeList %s",PackageFile.c_str()); @@ -522,11 +518,8 @@ bool debTranslationsIndex::Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const // Store the IMS information pkgCache::PkgFileIterator TransFile = Gen.GetCurFile(); - struct stat TransSt; - if (fstat(Trans.Fd(),&TransSt) != 0) - return _error->Errno("fstat","Failed to stat"); - TransFile->Size = TransSt.st_size; - TransFile->mtime = TransSt.st_mtime; + TransFile->Size = Trans.FileSize(); + TransFile->mtime = Trans.ModificationTime(); if (Gen.MergeList(TransParser) == false) return _error->Error("Problem with MergeList %s",TranslationFile.c_str()); @@ -608,8 +601,8 @@ bool debStatusIndex::Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const struct stat St; if (fstat(Pkg.Fd(),&St) != 0) return _error->Errno("fstat","Failed to stat"); - CFile->Size = St.st_size; - CFile->mtime = St.st_mtime; + CFile->Size = Pkg.FileSize(); + CFile->mtime = Pkg.ModificationTime(); CFile->Archive = Gen.WriteUniqString("now"); if (Gen.MergeList(Parser) == false) diff --git a/apt-pkg/edsp/edspindexfile.cc b/apt-pkg/edsp/edspindexfile.cc index 058cef636..5d824f9cb 100644 --- a/apt-pkg/edsp/edspindexfile.cc +++ b/apt-pkg/edsp/edspindexfile.cc @@ -49,11 +49,8 @@ bool edspIndex::Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const // Store the IMS information pkgCache::PkgFileIterator CFile = Gen.GetCurFile(); - struct stat St; - if (fstat(Pkg.Fd(),&St) != 0) - return _error->Errno("fstat","Failed to stat"); - CFile->Size = St.st_size; - CFile->mtime = St.st_mtime; + CFile->Size = Pkg.FileSize(); + CFile->mtime = Pkg.ModificationTime(); CFile->Archive = Gen.WriteUniqString("edsp::scenario"); if (Gen.MergeList(Parser) == false) diff --git a/debian/changelog b/debian/changelog index 685774a8f..a401d61a0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,3 @@ - apt (0.8.16~exp9) UNRELEASED; urgency=low [ Julian Andres Klode ] @@ -30,8 +29,10 @@ apt (0.8.16~exp9) UNRELEASED; urgency=low resolver as it's basically the same for the user, so no need to choose * cmdline/apt-config.cc: - dump the APT::Compressor settings correctly and completely + * apt-pkg/contrib/fileutl.{h,cc}: + - implement a ModificationTime method for FileFd - -- David Kalnischkies <kalnischkies@gmail.com> Sat, 10 Dec 2011 17:34:50 +0100 + -- David Kalnischkies <kalnischkies@gmail.com> Sat, 10 Dec 2011 20:02:29 +0100 apt (0.8.16~exp8) experimental; urgency=low -- cgit v1.2.3-70-g09d2 From 4e86b003bad2e6146c9fe8be492bdc9d212bcd74 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sun, 11 Dec 2011 00:41:50 +0100 Subject: strip the extension of the translation file before storing it in the list (regression from compression rewrite; found by Steve McIntyre, thanks!) --- apt-pkg/cdrom.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc index 2c40c731d..026094a6e 100644 --- a/apt-pkg/cdrom.cc +++ b/apt-pkg/cdrom.cc @@ -136,6 +136,7 @@ bool pkgCdrom::FindPackages(string CD, { if (_config->FindB("Debug::aptcdrom",false) == true) std::clog << "Found translation " << Dir->d_name << " in " << CD << "i18n/" << std::endl; + file.erase(file.size() - fileext.size()); TransList.push_back(CD + "i18n/" + file); break; } -- cgit v1.2.3-70-g09d2 From 711078ae18df09ca4f0c371c071c59458fad3918 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sun, 11 Dec 2011 00:58:35 +0100 Subject: use fileutl exists-functions instead of doing the stat'ing by hand --- apt-pkg/cdrom.cc | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc index 026094a6e..f5c19a4d6 100644 --- a/apt-pkg/cdrom.cc +++ b/apt-pkg/cdrom.cc @@ -58,15 +58,14 @@ bool pkgCdrom::FindPackages(string CD, return _error->Errno("chdir","Unable to change to %s",CD.c_str()); // Look for a .disk subdirectory - struct stat Buf; - if (stat(".disk",&Buf) == 0) + if (DirectoryExists(".disk") == true) { if (InfoDir.empty() == true) InfoDir = CD + ".disk/"; } // Don't look into directories that have been marked to ingore. - if (stat(".aptignr",&Buf) == 0) + if (RealFileExists(".aptignr") == true) return true; @@ -74,7 +73,7 @@ bool pkgCdrom::FindPackages(string CD, under a Packages/Source file are in control of that file and stops the scanning */ - if (stat("Release.gpg",&Buf) == 0) + if (RealFileExists("Release.gpg") == true) { SigList.push_back(CD); } @@ -86,7 +85,7 @@ bool pkgCdrom::FindPackages(string CD, for (std::vector<APT::Configuration::Compressor>::const_iterator c = compressor.begin(); c != compressor.end(); ++c) { - if (stat(std::string("Packages").append(c->Extension).c_str(), &Buf) != 0) + if (RealFileExists(std::string("Packages").append(c->Extension).c_str()) == false) continue; if (_config->FindB("Debug::aptcdrom",false) == true) @@ -101,7 +100,7 @@ bool pkgCdrom::FindPackages(string CD, for (std::vector<APT::Configuration::Compressor>::const_iterator c = compressor.begin(); c != compressor.end(); ++c) { - if (stat(std::string("Sources").append(c->Extension).c_str(), &Buf) != 0) + if (RealFileExists(std::string("Sources").append(c->Extension).c_str()) == false) continue; if (_config->FindB("Debug::aptcdrom",false) == true) -- cgit v1.2.3-70-g09d2 From 212080b87daa25944259287a5a625e63dd696ff0 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sun, 11 Dec 2011 01:30:45 +0100 Subject: * apt-pkg/cdrom.cc: - support InRelease files on cdrom --- apt-pkg/cdrom.cc | 4 ++-- apt-pkg/indexcopy.cc | 26 +++++++++++++++++++++----- debian/changelog | 4 +++- 3 files changed, 26 insertions(+), 8 deletions(-) diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc index f5c19a4d6..d9ecdf4f6 100644 --- a/apt-pkg/cdrom.cc +++ b/apt-pkg/cdrom.cc @@ -68,12 +68,11 @@ bool pkgCdrom::FindPackages(string CD, if (RealFileExists(".aptignr") == true) return true; - /* Check _first_ for a signature file as apt-cdrom assumes that all files under a Packages/Source file are in control of that file and stops the scanning */ - if (RealFileExists("Release.gpg") == true) + if (RealFileExists("Release.gpg") == true || RealFileExists("InRelease") == true) { SigList.push_back(CD); } @@ -718,6 +717,7 @@ bool pkgCdrom::Add(pkgCdromStatus *log) /*{{{*/ DropRepeats(List,"Packages"); DropRepeats(SourceList,"Sources"); DropRepeats(SigList,"Release.gpg"); + DropRepeats(SigList,"InRelease"); DropRepeats(TransList,""); if(log != NULL) { msg.str(""); diff --git a/apt-pkg/indexcopy.cc b/apt-pkg/indexcopy.cc index e38fe3e45..f6457aa39 100644 --- a/apt-pkg/indexcopy.cc +++ b/apt-pkg/indexcopy.cc @@ -638,13 +638,19 @@ bool SigVerify::CopyAndVerify(string CDROM,string Name,vector<string> &SigList, string const releasegpg = *I+"Release.gpg"; string const release = *I+"Release"; + string const inrelease = *I+"InRelease"; + bool useInRelease = true; // a Release.gpg without a Release should never happen - if(RealFileExists(release) == false) + if (RealFileExists(inrelease) == true) + ; + else if(RealFileExists(release) == false || RealFileExists(releasegpg) == false) { delete MetaIndex; continue; } + else + useInRelease = false; pid_t pid = ExecFork(); if(pid < 0) { @@ -652,11 +658,16 @@ bool SigVerify::CopyAndVerify(string CDROM,string Name,vector<string> &SigList, return false; } if(pid == 0) - RunGPGV(release, releasegpg); + { + if (useInRelease == true) + RunGPGV(inrelease, inrelease); + else + RunGPGV(release, releasegpg); + } if(!ExecWait(pid, "gpgv")) { _error->Warning("Signature verification failed for: %s", - releasegpg.c_str()); + (useInRelease ? inrelease.c_str() : releasegpg.c_str())); // something went wrong, don't copy the Release.gpg // FIXME: delete any existing gpg file? continue; @@ -686,8 +697,13 @@ bool SigVerify::CopyAndVerify(string CDROM,string Name,vector<string> &SigList, delete MetaIndex; // everything was fine, copy the Release and Release.gpg file - CopyMetaIndex(CDROM, Name, prefix, "Release"); - CopyMetaIndex(CDROM, Name, prefix, "Release.gpg"); + if (useInRelease == true) + CopyMetaIndex(CDROM, Name, prefix, "InRelease"); + else + { + CopyMetaIndex(CDROM, Name, prefix, "Release"); + CopyMetaIndex(CDROM, Name, prefix, "Release.gpg"); + } } return true; diff --git a/debian/changelog b/debian/changelog index a401d61a0..3e4a8fa3c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -31,8 +31,10 @@ apt (0.8.16~exp9) UNRELEASED; urgency=low - dump the APT::Compressor settings correctly and completely * apt-pkg/contrib/fileutl.{h,cc}: - implement a ModificationTime method for FileFd + * apt-pkg/cdrom.cc: + - support InRelease files on cdrom - -- David Kalnischkies <kalnischkies@gmail.com> Sat, 10 Dec 2011 20:02:29 +0100 + -- David Kalnischkies <kalnischkies@gmail.com> Sun, 11 Dec 2011 01:30:12 +0100 apt (0.8.16~exp8) experimental; urgency=low -- cgit v1.2.3-70-g09d2 From 2c405a44a0e4ff4c6f40e2521a55811179c87ec3 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sun, 11 Dec 2011 02:55:20 +0100 Subject: add a testcase for FindPackages() to better validate that cdrom should work. Unfortunately it's hard to do an automated integration test with cd, so we test this method in isolation which tries to find Indexes and dropping of duplications with DropRepeats() --- apt-pkg/cdrom.cc | 23 ++++++---- test/libapt/cdromfindpackages_test.cc | 86 +++++++++++++++++++++++++++++++++++ test/libapt/makefile | 6 +++ test/libapt/run-tests | 29 ++++++++++++ 4 files changed, 136 insertions(+), 8 deletions(-) create mode 100644 test/libapt/cdromfindpackages_test.cc diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc index d9ecdf4f6..4462d4e24 100644 --- a/apt-pkg/cdrom.cc +++ b/apt-pkg/cdrom.cc @@ -277,6 +277,7 @@ bool pkgCdrom::DropBinaryArch(vector<string> &List) /* Here we go and stat every file that we found and strip dup inodes. */ bool pkgCdrom::DropRepeats(vector<string> &List,const char *Name) { + bool couldFindAllFiles = true; // Get a list of all the inodes ino_t *Inodes = new ino_t[List.size()]; for (unsigned int I = 0; I != List.size(); ++I) @@ -297,21 +298,22 @@ bool pkgCdrom::DropRepeats(vector<string> &List,const char *Name) } if (found == false) - _error->Errno("stat","Failed to stat %s%s",List[I].c_str(), Name); + { + _error->Errno("stat","Failed to stat %s%s",List[I].c_str(), Name); + couldFindAllFiles = false; + Inodes[I] = 0; + } } - if (_error->PendingError() == true) { - delete[] Inodes; - return false; - } - // Look for dups for (unsigned int I = 0; I != List.size(); I++) { + if (Inodes[I] == 0) + continue; for (unsigned int J = I+1; J < List.size(); J++) { // No match - if (Inodes[J] != Inodes[I]) + if (Inodes[J] == 0 || Inodes[J] != Inodes[I]) continue; // We score the two paths.. and erase one @@ -337,7 +339,7 @@ bool pkgCdrom::DropRepeats(vector<string> &List,const char *Name) List.erase(List.begin()+I); } - return true; + return couldFindAllFiles; } /*}}}*/ // ReduceSourceList - Takes the path list and reduces it /*{{{*/ @@ -716,8 +718,13 @@ bool pkgCdrom::Add(pkgCdromStatus *log) /*{{{*/ DropBinaryArch(List); DropRepeats(List,"Packages"); DropRepeats(SourceList,"Sources"); + // FIXME: We ignore stat() errors here as we usually have only one of those in use + // This has little potencial to drop 'valid' stat() errors as we know that one of these + // files need to exist, but it would be better if we would check it here + _error->PushToStack(); DropRepeats(SigList,"Release.gpg"); DropRepeats(SigList,"InRelease"); + _error->RevertToStack(); DropRepeats(TransList,""); if(log != NULL) { msg.str(""); diff --git a/test/libapt/cdromfindpackages_test.cc b/test/libapt/cdromfindpackages_test.cc new file mode 100644 index 000000000..e9f5a51b0 --- /dev/null +++ b/test/libapt/cdromfindpackages_test.cc @@ -0,0 +1,86 @@ +#include <apt-pkg/cdrom.h> +#include <apt-pkg/error.h> + +#include <algorithm> +#include <string> +#include <vector> + +#include "assert.h" + +class Cdrom : public pkgCdrom { + public: + bool FindPackages(std::string const &CD, + std::vector<std::string> &List, + std::vector<std::string> &SList, + std::vector<std::string> &SigList, + std::vector<std::string> &TransList, + std::string &InfoDir) { + bool const result = pkgCdrom::FindPackages(CD, List, SList, SigList, TransList, InfoDir, NULL, 0); + std::sort(List.begin(), List.end()); + std::sort(SList.begin(), SList.end()); + std::sort(SigList.begin(), SigList.end()); + std::sort(TransList.begin(), TransList.end()); + return result; + } + + bool DropRepeats(std::vector<std::string> &List, char const *Name) { + return pkgCdrom::DropRepeats(List, Name); + } +}; + +int main(int argc, char const *argv[]) { + if (argc != 2) { + std::cout << "One parameter expected - given " << argc << std::endl; + return 100; + } + + Cdrom cd; + std::vector<std::string> Packages, Sources, Signatur, Translation; + std::string InfoDir; + std::string path = argv[1]; + equals(true, cd.FindPackages(path, Packages, Sources, Signatur, Translation, InfoDir)); + equals(4, Packages.size()); + equals(path + "/dists/sid/main/binary-i386/", Packages[0]); + equals(path + "/dists/stable/contrib/binary-amd64/", Packages[1]); + equals(path + "/dists/stable/main/binary-i386/", Packages[2]); + equals(path + "/dists/unstable/main/binary-i386/", Packages[3]); + equals(3, Sources.size()); + equals(path + "/dists/sid/main/source/", Sources[0]); + equals(path + "/dists/stable/main/source/", Sources[1]); + equals(path + "/dists/unstable/main/source/", Sources[2]); + equals(3, Signatur.size()); + equals(path + "/dists/sid/", Signatur[0]); + equals(path + "/dists/stable/", Signatur[1]); + equals(path + "/dists/unstable/", Signatur[2]); + equals(4, Translation.size()); + equals(path + "/dists/sid/main/i18n/Translation-de", Translation[0]); + equals(path + "/dists/sid/main/i18n/Translation-en", Translation[1]); + equals(path + "/dists/unstable/main/i18n/Translation-de", Translation[2]); + equals(path + "/dists/unstable/main/i18n/Translation-en", Translation[3]); + equals(path + "/.disk/", InfoDir); + + cd.DropRepeats(Packages, "Packages"); + cd.DropRepeats(Sources, "Sources"); + _error->PushToStack(); + cd.DropRepeats(Signatur, "InRelease"); + cd.DropRepeats(Signatur, "Release.gpg"); + _error->RevertToStack(); + _error->DumpErrors(); + cd.DropRepeats(Translation, ""); + + equals(3, Packages.size()); + equals(path + "/dists/stable/contrib/binary-amd64/", Packages[0]); + equals(path + "/dists/stable/main/binary-i386/", Packages[1]); + equals(path + "/dists/unstable/main/binary-i386/", Packages[2]); + equals(2, Sources.size()); + equals(path + "/dists/stable/main/source/", Sources[0]); + equals(path + "/dists/unstable/main/source/", Sources[1]); + equals(2, Signatur.size()); + equals(path + "/dists/stable/", Signatur[0]); + equals(path + "/dists/unstable/", Signatur[1]); + equals(2, Translation.size()); + equals(path + "/dists/unstable/main/i18n/Translation-de", Translation[0]); + equals(path + "/dists/unstable/main/i18n/Translation-en", Translation[1]); + + return 0; +} diff --git a/test/libapt/makefile b/test/libapt/makefile index d3dddaeed..1952051e2 100644 --- a/test/libapt/makefile +++ b/test/libapt/makefile @@ -74,3 +74,9 @@ PROGRAM = Configuration${BASENAME} SLIBS = -lapt-pkg SOURCE = configuration_test.cc include $(PROGRAM_H) + +# test cdroms core FindPackages +PROGRAM = CdromFindPackages${BASENAME} +SLIBS = -lapt-pkg +SOURCE = cdromfindpackages_test.cc +include $(PROGRAM_H) diff --git a/test/libapt/run-tests b/test/libapt/run-tests index ada2dc38b..bd47d4e0d 100755 --- a/test/libapt/run-tests +++ b/test/libapt/run-tests @@ -75,6 +75,35 @@ do continue elif [ $name = "CompareVersion${EXT}" ]; then tmppath="${DIR}/versions.lst" + elif [ $name = "CdromFindPackages${EXT}" ]; then + tmppath=$(mktemp -d) + mkdir -p "${tmppath}/.disk" "${tmppath}/pool" \ + "${tmppath}/dists/stable/main/binary-i386" \ + "${tmppath}/dists/stable/main/source" \ + "${tmppath}/dists/stable/contrib/binary-amd64" \ + "${tmppath}/dists/stable/contrib/binary-all" \ + "${tmppath}/dists/unstable/main/binary-i386" \ + "${tmppath}/dists/unstable/main/i18n" \ + "${tmppath}/dists/unstable/main/source" \ + "${tmppath}/dists/broken/non-free/source" + touch "${tmppath}/dists/broken/.aptignr" \ + "${tmppath}/dists/stable/main/binary-i386/Packages" \ + "${tmppath}/dists/stable/main/binary-i386/Packages.gz" \ + "${tmppath}/dists/stable/main/source/Sources.gz" \ + "${tmppath}/dists/stable/contrib/binary-amd64/Packages" \ + "${tmppath}/dists/stable/contrib/binary-amd64/Packages.gz" \ + "${tmppath}/dists/stable/contrib/binary-all/Packages" \ + "${tmppath}/dists/unstable/main/binary-i386/Packages.gz" \ + "${tmppath}/dists/unstable/main/binary-i386/Packages.gz" \ + "${tmppath}/dists/unstable/main/i18n/Translation-en" \ + "${tmppath}/dists/unstable/main/i18n/Translation-de.gz" \ + "${tmppath}/dists/unstable/main/source/Sources.gz" \ + "${tmppath}/dists/broken/non-free/source/Sources.gz" \ + "${tmppath}/dists/stable/Release.gpg" \ + "${tmppath}/dists/stable/Release" \ + "${tmppath}/dists/unstable/InRelease" \ + "${tmppath}/dists/broken/Release.gpg" + ln -s "${tmppath}/dists/unstable" "${tmppath}/dists/sid" fi echo -n "Testing with ${NAME} " -- cgit v1.2.3-70-g09d2 From eed564b853a0e5778080c5c3012517a814041d5a Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sun, 11 Dec 2011 13:08:21 +0100 Subject: use different compression types in the test now that we support them --- test/libapt/run-tests | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/test/libapt/run-tests b/test/libapt/run-tests index bd47d4e0d..5fff4ecca 100755 --- a/test/libapt/run-tests +++ b/test/libapt/run-tests @@ -88,16 +88,16 @@ do "${tmppath}/dists/broken/non-free/source" touch "${tmppath}/dists/broken/.aptignr" \ "${tmppath}/dists/stable/main/binary-i386/Packages" \ - "${tmppath}/dists/stable/main/binary-i386/Packages.gz" \ - "${tmppath}/dists/stable/main/source/Sources.gz" \ + "${tmppath}/dists/stable/main/binary-i386/Packages.bz2" \ + "${tmppath}/dists/stable/main/source/Sources.xz" \ "${tmppath}/dists/stable/contrib/binary-amd64/Packages" \ "${tmppath}/dists/stable/contrib/binary-amd64/Packages.gz" \ "${tmppath}/dists/stable/contrib/binary-all/Packages" \ - "${tmppath}/dists/unstable/main/binary-i386/Packages.gz" \ - "${tmppath}/dists/unstable/main/binary-i386/Packages.gz" \ + "${tmppath}/dists/unstable/main/binary-i386/Packages.xz" \ + "${tmppath}/dists/unstable/main/binary-i386/Packages.lzma" \ "${tmppath}/dists/unstable/main/i18n/Translation-en" \ - "${tmppath}/dists/unstable/main/i18n/Translation-de.gz" \ - "${tmppath}/dists/unstable/main/source/Sources.gz" \ + "${tmppath}/dists/unstable/main/i18n/Translation-de.bz2" \ + "${tmppath}/dists/unstable/main/source/Sources.xz" \ "${tmppath}/dists/broken/non-free/source/Sources.gz" \ "${tmppath}/dists/stable/Release.gpg" \ "${tmppath}/dists/stable/Release" \ -- cgit v1.2.3-70-g09d2 From 032bd56ff86166fd4b6a8f69bd9d5d1bc57b886e Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sun, 11 Dec 2011 19:46:59 +0100 Subject: - add a ReadLine method - drop the explicit export of gz-compression handling --- apt-pkg/contrib/fileutl.cc | 83 ++++++++++++++++++++++++++++++++++------------ apt-pkg/contrib/fileutl.h | 30 +++++++++++------ apt-pkg/contrib/mmap.cc | 13 +++++++- debian/changelog | 4 ++- methods/rred.cc | 42 ++++++++--------------- 5 files changed, 110 insertions(+), 62 deletions(-) diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index 83b68e796..58cd6dceb 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -44,6 +44,8 @@ #include <set> #include <algorithm> +#include <zlib.h> + #ifdef WORDS_BIGENDIAN #include <inttypes.h> #endif @@ -53,6 +55,12 @@ using namespace std; +class FileFdPrivate { + public: + gzFile gz; + FileFdPrivate() : gz(NULL) {}; +}; + // RunScripts - Run a set of scripts from a configuration subtree /*{{{*/ // --------------------------------------------------------------------- /* */ @@ -719,11 +727,12 @@ bool ExecWait(pid_t Pid,const char *Name,bool Reap) // FileFd::Open - Open a file /*{{{*/ // --------------------------------------------------------------------- /* The most commonly used open mode combinations are given with Mode */ -bool FileFd::Open(string FileName,OpenMode Mode,CompressMode Compress, unsigned long Perms) +bool FileFd::Open(string FileName,OpenMode Mode,CompressMode Compress, unsigned long const Perms) { if (Mode == ReadOnlyGzip) return Open(FileName, ReadOnly, Gzip, Perms); Close(); + d = new FileFdPrivate; Flags = AutoClose; if (Compress == Auto && (Mode & WriteOnly) == WriteOnly) @@ -865,6 +874,7 @@ bool FileFd::Open(string FileName,OpenMode Mode,CompressMode Compress, unsigned bool FileFd::OpenDescriptor(int Fd, OpenMode Mode, CompressMode Compress, bool AutoClose) { Close(); + d = new FileFdPrivate; Flags = (AutoClose) ? FileFd::AutoClose : 0; iFd = Fd; if (OpenInternDescriptor(Mode, Compress) == false) @@ -883,13 +893,14 @@ bool FileFd::OpenInternDescriptor(OpenMode Mode, CompressMode Compress) else if (Compress == Gzip) { if ((Mode & ReadWrite) == ReadWrite) - gz = gzdopen(iFd, "r+"); + d->gz = gzdopen(iFd, "r+"); else if ((Mode & WriteOnly) == WriteOnly) - gz = gzdopen(iFd, "w"); + d->gz = gzdopen(iFd, "w"); else - gz = gzdopen (iFd, "r"); - if (gz == NULL) + d->gz = gzdopen (iFd, "r"); + if (d->gz == NULL) return false; + Flags |= Compressed; } else return false; @@ -918,8 +929,8 @@ bool FileFd::Read(void *To,unsigned long long Size,unsigned long long *Actual) do { - if (gz != NULL) - Res = gzread(gz,To,Size); + if (d->gz != NULL) + Res = gzread(d->gz,To,Size); else Res = read(iFd,To,Size); if (Res < 0 && errno == EINTR) @@ -951,6 +962,28 @@ bool FileFd::Read(void *To,unsigned long long Size,unsigned long long *Actual) return _error->Error(_("read, still have %llu to read but none left"), Size); } /*}}}*/ +// FileFd::ReadLine - Read a complete line from the file /*{{{*/ +// --------------------------------------------------------------------- +/* Beware: This method can be quiet slow for big buffers on UNcompressed + files because of the naive implementation! */ +char* FileFd::ReadLine(char *To, unsigned long long const Size) +{ + if (d->gz != NULL) + return gzgets(d->gz, To, Size); + + unsigned long long read = 0; + if (Read(To, Size, &read) == false) + return NULL; + char* c = To; + for (; *c != '\n' && *c != '\0' && read != 0; --read, ++c) + ; // find the end of the line + if (*c != '\0') + *c = '\0'; + if (read != 0) + Seek(Tell() - read); + return To; +} + /*}}}*/ // FileFd::Write - Write to the file /*{{{*/ // --------------------------------------------------------------------- /* */ @@ -960,8 +993,8 @@ bool FileFd::Write(const void *From,unsigned long long Size) errno = 0; do { - if (gz != NULL) - Res = gzwrite(gz,From,Size); + if (d->gz != NULL) + Res = gzwrite(d->gz,From,Size); else Res = write(iFd,From,Size); if (Res < 0 && errno == EINTR) @@ -990,8 +1023,8 @@ bool FileFd::Write(const void *From,unsigned long long Size) bool FileFd::Seek(unsigned long long To) { int res; - if (gz) - res = gzseek(gz,To,SEEK_SET); + if (d->gz) + res = gzseek(d->gz,To,SEEK_SET); else res = lseek(iFd,To,SEEK_SET); if (res != (signed)To) @@ -1009,8 +1042,8 @@ bool FileFd::Seek(unsigned long long To) bool FileFd::Skip(unsigned long long Over) { int res; - if (gz) - res = gzseek(gz,Over,SEEK_CUR); + if (d->gz != NULL) + res = gzseek(d->gz,Over,SEEK_CUR); else res = lseek(iFd,Over,SEEK_CUR); if (res < 0) @@ -1027,7 +1060,7 @@ bool FileFd::Skip(unsigned long long Over) /* */ bool FileFd::Truncate(unsigned long long To) { - if (gz) + if (d->gz != NULL) { Flags |= Fail; return _error->Error("Truncating gzipped files is not implemented (%s)", FileName.c_str()); @@ -1047,8 +1080,8 @@ bool FileFd::Truncate(unsigned long long To) unsigned long long FileFd::Tell() { off_t Res; - if (gz) - Res = gztell(gz); + if (d->gz != NULL) + Res = gztell(d->gz); else Res = lseek(iFd,0,SEEK_CUR); if (Res == (off_t)-1) @@ -1076,9 +1109,9 @@ unsigned long long FileFd::Size() unsigned long long size = FileSize(); // only check gzsize if we are actually a gzip file, just checking for - // "gz" is not sufficient as uncompressed files will be opened with + // "gz" is not sufficient as uncompressed files could be opened with // gzopen in "direct" mode as well - if (gz && !gzdirect(gz) && size > 0) + if (d->gz && !gzdirect(d->gz) && size > 0) { /* unfortunately zlib.h doesn't provide a gzsize(), so we have to do * this ourselves; the original (uncompressed) file size is the last 32 @@ -1125,11 +1158,14 @@ time_t FileFd::ModificationTime() /* */ bool FileFd::Close() { + if (iFd == -1) + return true; + bool Res = true; if ((Flags & AutoClose) == AutoClose) { - if (gz != NULL) { - int const e = gzclose(gz); + if (d != NULL && d->gz != NULL) { + int const e = gzclose(d->gz); // gzdopen() on empty files always fails with "buffer error" here, ignore that if (e != 0 && e != Z_BUF_ERROR) Res &= _error->Errno("close",_("Problem closing the gzip file %s"), FileName.c_str()); @@ -1147,13 +1183,17 @@ bool FileFd::Close() } iFd = -1; - gz = NULL; if ((Flags & Fail) == Fail && (Flags & DelOnFail) == DelOnFail && FileName.empty() == false) if (unlink(FileName.c_str()) != 0) Res &= _error->WarningE("unlnk",_("Problem unlinking the file %s"), FileName.c_str()); + if (d != NULL) + { + delete d; + d = NULL; + } return Res; } @@ -1170,3 +1210,4 @@ bool FileFd::Sync() return true; } /*}}}*/ +gzFile FileFd::gzFd() {return d->gz;}; diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h index 8f2d7a0a0..209ca91e7 100644 --- a/apt-pkg/contrib/fileutl.h +++ b/apt-pkg/contrib/fileutl.h @@ -31,17 +31,17 @@ /* Define this for python-apt */ #define APT_HAS_GZIP 1 +class FileFdPrivate; class FileFd { protected: int iFd; enum LocalFlags {AutoClose = (1<<0),Fail = (1<<1),DelOnFail = (1<<2), - HitEof = (1<<3), Replace = (1<<4) }; + HitEof = (1<<3), Replace = (1<<4), Compressed = (1<<5) }; unsigned long Flags; std::string FileName; std::string TemporaryFileName; - gzFile gz; public: enum OpenMode { @@ -71,6 +71,7 @@ class FileFd return Read(To,Size); } bool Read(void *To,unsigned long long Size,unsigned long long *Actual = 0); + char* ReadLine(char *To, unsigned long long const Size); bool Write(const void *From,unsigned long long Size); bool Seek(unsigned long long To); bool Skip(unsigned long long To); @@ -94,8 +95,8 @@ class FileFd return T; } - bool Open(std::string FileName,OpenMode Mode,CompressMode Compress,unsigned long Perms = 0666); - inline bool Open(std::string const &FileName,OpenMode Mode, unsigned long Perms = 0666) { + bool Open(std::string FileName,OpenMode Mode,CompressMode Compress,unsigned long const Perms = 0666); + inline bool Open(std::string const &FileName,OpenMode Mode, unsigned long const Perms = 0666) { return Open(FileName, Mode, None, Perms); }; bool OpenDescriptor(int Fd, OpenMode Mode, CompressMode Compress, bool AutoClose=false); @@ -108,29 +109,36 @@ class FileFd // Simple manipulators inline int Fd() {return iFd;}; inline void Fd(int fd) {iFd = fd;}; - inline gzFile gzFd() {return gz;}; + __deprecated gzFile gzFd(); inline bool IsOpen() {return iFd >= 0;}; inline bool Failed() {return (Flags & Fail) == Fail;}; inline void EraseOnFailure() {Flags |= DelOnFail;}; inline void OpFail() {Flags |= Fail;}; inline bool Eof() {return (Flags & HitEof) == HitEof;}; + inline bool IsCompressed() {return (Flags & Compressed) == Compressed;}; inline std::string &Name() {return FileName;}; - FileFd(std::string FileName,OpenMode Mode,unsigned long Perms = 0666) : iFd(-1), - Flags(0), gz(NULL) + FileFd(std::string FileName,OpenMode Mode,unsigned long Perms = 0666) : iFd(-1), Flags(0), d(NULL) { Open(FileName,Mode, None, Perms); }; - FileFd(std::string FileName,OpenMode Mode, CompressMode Compress, unsigned long Perms = 0666) : - iFd(-1), Flags(0), gz(NULL) + FileFd(std::string FileName,OpenMode Mode, CompressMode Compress, unsigned long Perms = 0666) : iFd(-1), Flags(0), d(NULL) { Open(FileName,Mode, Compress, Perms); }; - FileFd(int Fd = -1) : iFd(Fd), Flags(AutoClose), gz(NULL) {}; - FileFd(int Fd,bool) : iFd(Fd), Flags(0), gz(NULL) {}; + FileFd() : iFd(-1), Flags(AutoClose), d(NULL) {}; + FileFd(int const Fd, OpenMode Mode = ReadWrite, CompressMode Compress = None) : iFd(-1), Flags(0), d(NULL) + { + OpenDescriptor(Fd, Mode, Compress); + }; + FileFd(int const Fd, bool const AutoClose) : iFd(-1), Flags(0), d(NULL) + { + OpenDescriptor(Fd, ReadWrite, None, AutoClose); + }; virtual ~FileFd(); private: + FileFdPrivate* d; bool OpenInternDescriptor(OpenMode Mode, CompressMode Compress); }; diff --git a/apt-pkg/contrib/mmap.cc b/apt-pkg/contrib/mmap.cc index f76169a92..1fb84b0af 100644 --- a/apt-pkg/contrib/mmap.cc +++ b/apt-pkg/contrib/mmap.cc @@ -77,7 +77,18 @@ bool MMap::Map(FileFd &Fd) if (iSize == 0) return _error->Error(_("Can't mmap an empty file")); - + + // We can't mmap compressed fd's directly, so we need to read it completely + if (Fd.IsCompressed() == true) + { + if ((Flags & ReadOnly) != ReadOnly) + return _error->Error("Compressed file %s can only be mapped readonly", Fd.Name().c_str()); + Base = new unsigned char[iSize]; + if (Fd.Seek(0L) == false || Fd.Read(Base, iSize) == false) + return false; + return true; + } + // Map it. Base = mmap(0,iSize,Prot,Map,Fd.Fd(),0); if (Base == (void *)-1) diff --git a/debian/changelog b/debian/changelog index 3e4a8fa3c..197e27a65 100644 --- a/debian/changelog +++ b/debian/changelog @@ -31,10 +31,12 @@ apt (0.8.16~exp9) UNRELEASED; urgency=low - dump the APT::Compressor settings correctly and completely * apt-pkg/contrib/fileutl.{h,cc}: - implement a ModificationTime method for FileFd + - add a ReadLine method + - drop the explicit export of gz-compression handling * apt-pkg/cdrom.cc: - support InRelease files on cdrom - -- David Kalnischkies <kalnischkies@gmail.com> Sun, 11 Dec 2011 01:30:12 +0100 + -- David Kalnischkies <kalnischkies@gmail.com> Sun, 11 Dec 2011 19:34:58 +0100 apt (0.8.16~exp8) experimental; urgency=low diff --git a/methods/rred.cc b/methods/rred.cc index 56ad8220b..2a70a9f91 100644 --- a/methods/rred.cc +++ b/methods/rred.cc @@ -37,13 +37,13 @@ class RredMethod : public pkgAcqMethod { // return values enum State {ED_OK, ED_ORDERING, ED_PARSER, ED_FAILURE, MMAP_FAILED}; - State applyFile(gzFile &ed_cmds, FILE *in_file, FILE *out_file, + State applyFile(FileFd &ed_cmds, FILE *in_file, FILE *out_file, unsigned long &line, char *buffer, Hashes *hash) const; void ignoreLineInFile(FILE *fin, char *buffer) const; - void ignoreLineInFile(gzFile &fin, char *buffer) const; + void ignoreLineInFile(FileFd &fin, char *buffer) const; void copyLinesFromFileToFile(FILE *fin, FILE *fout, unsigned int lines, Hashes *hash, char *buffer) const; - void copyLinesFromFileToFile(gzFile &fin, FILE *fout, unsigned int lines, + void copyLinesFromFileToFile(FileFd &fin, FILE *fout, unsigned int lines, Hashes *hash, char *buffer) const; State patchFile(FileFd &Patch, FileFd &From, FileFd &out_file, Hashes *hash) const; @@ -72,10 +72,10 @@ public: * \param hash the created file for correctness * \return the success State of the ed command executor */ -RredMethod::State RredMethod::applyFile(gzFile &ed_cmds, FILE *in_file, FILE *out_file, +RredMethod::State RredMethod::applyFile(FileFd &ed_cmds, FILE *in_file, FILE *out_file, unsigned long &line, char *buffer, Hashes *hash) const { // get the current command and parse it - if (gzgets(ed_cmds, buffer, BUF_SIZE) == NULL) { + if (ed_cmds.ReadLine(buffer, BUF_SIZE) == NULL) { if (Debug == true) std::clog << "rred: encounter end of file - we can start patching now." << std::endl; line = 0; @@ -130,7 +130,7 @@ RredMethod::State RredMethod::applyFile(gzFile &ed_cmds, FILE *in_file, FILE *ou unsigned char mode = *idx; // save the current position - unsigned const long pos = gztell(ed_cmds); + unsigned const long long pos = ed_cmds.Tell(); // if this is add or change then go to the next full stop unsigned int data_length = 0; @@ -164,7 +164,7 @@ RredMethod::State RredMethod::applyFile(gzFile &ed_cmds, FILE *in_file, FILE *ou // include data from ed script if (mode == MODE_CHANGED || mode == MODE_ADDED) { - gzseek(ed_cmds, pos, SEEK_SET); + ed_cmds.Seek(pos); copyLinesFromFileToFile(ed_cmds, out_file, data_length, hash, buffer); } @@ -190,11 +190,11 @@ void RredMethod::copyLinesFromFileToFile(FILE *fin, FILE *fout, unsigned int lin } } /*}}}*/ -void RredMethod::copyLinesFromFileToFile(gzFile &fin, FILE *fout, unsigned int lines,/*{{{*/ +void RredMethod::copyLinesFromFileToFile(FileFd &fin, FILE *fout, unsigned int lines,/*{{{*/ Hashes *hash, char *buffer) const { while (0 < lines--) { do { - gzgets(fin, buffer, BUF_SIZE); + fin.ReadLine(buffer, BUF_SIZE); size_t const written = fwrite(buffer, 1, strlen(buffer), fout); hash->Add((unsigned char*)buffer, written); } while (strlen(buffer) == (BUF_SIZE - 1) && @@ -211,11 +211,11 @@ void RredMethod::ignoreLineInFile(FILE *fin, char *buffer) const { /*{{{*/ } } /*}}}*/ -void RredMethod::ignoreLineInFile(gzFile &fin, char *buffer) const { /*{{{*/ - gzgets(fin, buffer, BUF_SIZE); +void RredMethod::ignoreLineInFile(FileFd &fin, char *buffer) const { /*{{{*/ + fin.ReadLine(buffer, BUF_SIZE); while (strlen(buffer) == (BUF_SIZE - 1) && buffer[BUF_SIZE - 2] != '\n') { - gzgets(fin, buffer, BUF_SIZE); + fin.ReadLine(buffer, BUF_SIZE); buffer[0] = ' '; } } @@ -224,12 +224,11 @@ RredMethod::State RredMethod::patchFile(FileFd &Patch, FileFd &From, /*{{{*/ FileFd &out_file, Hashes *hash) const { char buffer[BUF_SIZE]; FILE* fFrom = fdopen(From.Fd(), "r"); - gzFile fPatch = Patch.gzFd(); FILE* fTo = fdopen(out_file.Fd(), "w"); /* we do a tail recursion to read the commands in the right order */ unsigned long line = -1; // assign highest possible value - State const result = applyFile(fPatch, fFrom, fTo, line, buffer, hash); + State const result = applyFile(Patch, fFrom, fTo, line, buffer, hash); /* read the rest from infile */ if (result == ED_OK) { @@ -258,20 +257,7 @@ struct EdCommand { RredMethod::State RredMethod::patchMMap(FileFd &Patch, FileFd &From, /*{{{*/ FileFd &out_file, Hashes *hash) const { #ifdef _POSIX_MAPPED_FILES - MMap ed_cmds(MMap::ReadOnly); - if (Patch.gzFd() != NULL) { - unsigned long long mapSize = Patch.Size(); - DynamicMMap* dyn = new DynamicMMap(0, mapSize, 0); - if (dyn->validData() == false) { - delete dyn; - return MMAP_FAILED; - } - dyn->AddSize(mapSize); - gzread(Patch.gzFd(), dyn->Data(), mapSize); - ed_cmds = *dyn; - } else - ed_cmds = MMap(Patch, MMap::ReadOnly); - + MMap ed_cmds(Patch, MMap::ReadOnly); MMap in_file(From, MMap::ReadOnly); if (ed_cmds.Size() == 0 || in_file.Size() == 0) -- cgit v1.2.3-70-g09d2 From 699b209e5122f8fcd85fc4666c9b7020286ab0d0 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Tue, 13 Dec 2011 00:17:30 +0100 Subject: Allow the FileFd to use an external Compressor to uncompress a given file internally so that it is exported and can be used like a "normal" uncompressed file with FileFd This allows us to hide th zlib usage in the implementation and use gzip instead if we don't have zlib builtin (the same for other compressors). The code includes quiet a few FIXME's so while all tests are working it shouldn't be used just yet outside of libapt as it might break. --- apt-pkg/contrib/fileutl.cc | 302 +++++++++++++++++++++++++++++++++++++++++-- apt-pkg/contrib/fileutl.h | 10 ++ apt-pkg/contrib/mmap.cc | 9 +- apt-pkg/deb/deblistparser.cc | 1 + apt-pkg/indexcopy.cc | 97 +------------- ftparchive/multicompress.cc | 74 +---------- ftparchive/multicompress.h | 2 - 7 files changed, 320 insertions(+), 175 deletions(-) diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index 58cd6dceb..727d3ddb5 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -44,7 +44,13 @@ #include <set> #include <algorithm> +// FIXME: Compressor Fds have some speed disadvantages and are a bit buggy currently, +// so while the current implementation satisfies the testcases it is not a real option +// to disable it for now +#define APT_USE_ZLIB 1 +#ifdef APT_USE_ZLIB #include <zlib.h> +#endif #ifdef WORDS_BIGENDIAN #include <inttypes.h> @@ -57,8 +63,16 @@ using namespace std; class FileFdPrivate { public: +#ifdef APT_USE_ZLIB gzFile gz; - FileFdPrivate() : gz(NULL) {}; +#else + void* gz; +#endif + pid_t compressor_pid; + bool pipe; + APT::Configuration::Compressor compressor; + FileFd::OpenMode openmode; + FileFdPrivate() : gz(NULL), compressor_pid(-1), pipe(false) {}; }; // RunScripts - Run a set of scripts from a configuration subtree /*{{{*/ @@ -724,6 +738,175 @@ bool ExecWait(pid_t Pid,const char *Name,bool Reap) } /*}}}*/ +// ExecCompressor - Open a de/compressor pipe /*{{{*/ +// --------------------------------------------------------------------- +/* This opens the compressor, either in compress mode or decompress + mode. FileFd is always the compressor input/output file, + OutFd is the created pipe, Input for Compress, Output for Decompress. */ +bool ExecCompressor(APT::Configuration::Compressor const &Prog, + pid_t *Pid, int const FileFd, int &OutFd, bool const Comp) +{ + if (Pid != NULL) + *Pid = -1; + + // No compression + if (Prog.Binary.empty() == true) + { + OutFd = dup(FileFd); + return true; + } + + // Handle 'decompression' of empty files + if (Comp == false) + { + struct stat Buf; + fstat(FileFd, &Buf); + if (Buf.st_size == 0 && S_ISFIFO(Buf.st_mode) == false) + { + OutFd = FileFd; + return true; + } + } + + // Create a data pipe + int Pipe[2] = {-1,-1}; + if (pipe(Pipe) != 0) + return _error->Errno("pipe",_("Failed to create subprocess IPC")); + for (int J = 0; J != 2; J++) + SetCloseExec(Pipe[J],true); + + if (Comp == true) + OutFd = Pipe[1]; + else + OutFd = Pipe[0]; + + // The child.. + pid_t child = ExecFork(); + if (Pid != NULL) + *Pid = child; + if (child == 0) + { + if (Comp == true) + { + dup2(FileFd,STDOUT_FILENO); + dup2(Pipe[0],STDIN_FILENO); + } + else + { + dup2(FileFd,STDIN_FILENO); + dup2(Pipe[1],STDOUT_FILENO); + } + + SetCloseExec(STDOUT_FILENO,false); + SetCloseExec(STDIN_FILENO,false); + + std::vector<char const*> Args; + Args.push_back(Prog.Binary.c_str()); + std::vector<std::string> const * const addArgs = + (Comp == true) ? &(Prog.CompressArgs) : &(Prog.UncompressArgs); + for (std::vector<std::string>::const_iterator a = addArgs->begin(); + a != addArgs->end(); ++a) + Args.push_back(a->c_str()); + Args.push_back(NULL); + + execvp(Args[0],(char **)&Args[0]); + cerr << _("Failed to exec compressor ") << Args[0] << endl; + _exit(100); + } + if (Comp == true) + close(Pipe[0]); + else + close(Pipe[1]); + + if (Pid == NULL) + ExecWait(child, Prog.Binary.c_str(), true); + + return true; +} +bool ExecCompressor(APT::Configuration::Compressor const &Prog, + pid_t *Pid, std::string const &FileName, int &OutFd, bool const Comp) +{ + if (Pid != NULL) + *Pid = -1; + + // No compression + if (Prog.Binary.empty() == true) + { + if (Comp == true) + OutFd = open(FileName.c_str(), O_WRONLY, 0666); + else + OutFd = open(FileName.c_str(), O_RDONLY); + return true; + } + + // Handle 'decompression' of empty files + if (Comp == false) + { + struct stat Buf; + stat(FileName.c_str(), &Buf); + if (Buf.st_size == 0) + { + OutFd = open(FileName.c_str(), O_RDONLY); + return true; + } + } + + // Create a data pipe + int Pipe[2] = {-1,-1}; + if (pipe(Pipe) != 0) + return _error->Errno("pipe",_("Failed to create subprocess IPC")); + for (int J = 0; J != 2; J++) + SetCloseExec(Pipe[J],true); + + if (Comp == true) + OutFd = Pipe[1]; + else + OutFd = Pipe[0]; + + // The child.. + pid_t child = ExecFork(); + if (Pid != NULL) + *Pid = child; + if (child == 0) + { + if (Comp == true) + { + dup2(Pipe[0],STDIN_FILENO); + SetCloseExec(STDIN_FILENO,false); + } + else + { + dup2(Pipe[1],STDOUT_FILENO); + SetCloseExec(STDOUT_FILENO,false); + } + + std::vector<char const*> Args; + Args.push_back(Prog.Binary.c_str()); + std::vector<std::string> const * const addArgs = + (Comp == true) ? &(Prog.CompressArgs) : &(Prog.UncompressArgs); + for (std::vector<std::string>::const_iterator a = addArgs->begin(); + a != addArgs->end(); ++a) + Args.push_back(a->c_str()); + Args.push_back("--stdout"); + Args.push_back(FileName.c_str()); + Args.push_back(NULL); + + execvp(Args[0],(char **)&Args[0]); + cerr << _("Failed to exec compressor ") << Args[0] << endl; + _exit(100); + } + if (Comp == true) + close(Pipe[0]); + else + close(Pipe[1]); + + if (Pid == NULL) + ExecWait(child, Prog.Binary.c_str(), false); + + return true; +} + /*}}}*/ + // FileFd::Open - Open a file /*{{{*/ // --------------------------------------------------------------------- /* The most commonly used open mode combinations are given with Mode */ @@ -733,6 +916,7 @@ bool FileFd::Open(string FileName,OpenMode Mode,CompressMode Compress, unsigned return Open(FileName, ReadOnly, Gzip, Perms); Close(); d = new FileFdPrivate; + d->openmode = Mode; Flags = AutoClose; if (Compress == Auto && (Mode & WriteOnly) == WriteOnly) @@ -805,12 +989,15 @@ bool FileFd::Open(string FileName,OpenMode Mode,CompressMode Compress, unsigned // if we have them, use inbuilt compressors instead of forking if (compressor != compressors.end()) { +#ifdef APT_USE_ZLIB if (compressor->Name == "gzip") { Compress = Gzip; compressor = compressors.end(); } - else if (compressor->Name == "." || Compress == None) + else +#endif + if (compressor->Name == ".") { Compress = None; compressor = compressors.end(); @@ -839,9 +1026,12 @@ bool FileFd::Open(string FileName,OpenMode Mode,CompressMode Compress, unsigned if (compressor != compressors.end()) { if ((Mode & ReadWrite) == ReadWrite) - _error->Error("External compressors like %s do not support readwrite mode for file %s", compressor->Name.c_str(), FileName.c_str()); + return _error->Error("External compressors like %s do not support readwrite mode for file %s", compressor->Name.c_str(), FileName.c_str()); - _error->Error("Forking external compressor %s is not implemented for %s", compressor->Name.c_str(), FileName.c_str()); + if (ExecCompressor(*compressor, NULL /*d->compressor_pid*/, FileName, iFd, ((Mode & ReadOnly) != ReadOnly)) == false) + return _error->Error("Forking external compressor %s is not implemented for %s", compressor->Name.c_str(), FileName.c_str()); + d->pipe = true; + d->compressor = *compressor; } else { @@ -875,6 +1065,7 @@ bool FileFd::OpenDescriptor(int Fd, OpenMode Mode, CompressMode Compress, bool A { Close(); d = new FileFdPrivate; + d->openmode = Mode; Flags = (AutoClose) ? FileFd::AutoClose : 0; iFd = Fd; if (OpenInternDescriptor(Mode, Compress) == false) @@ -890,6 +1081,7 @@ bool FileFd::OpenInternDescriptor(OpenMode Mode, CompressMode Compress) { if (Compress == None) return true; +#ifdef APT_USE_ZLIB else if (Compress == Gzip) { if ((Mode & ReadWrite) == ReadWrite) @@ -902,8 +1094,29 @@ bool FileFd::OpenInternDescriptor(OpenMode Mode, CompressMode Compress) return false; Flags |= Compressed; } +#endif else - return false; + { + std::string name; + switch (Compress) + { + case Gzip: name = "gzip"; break; + case Bzip2: name = "bzip2"; break; + case Lzma: name = "lzma"; break; + case Xz: name = "xz"; break; + default: return _error->Error("Can't find a match for specified compressor mode for file %s", FileName.c_str()); + } + std::vector<APT::Configuration::Compressor> const compressors = APT::Configuration::getCompressors(); + std::vector<APT::Configuration::Compressor>::const_iterator compressor = compressors.begin(); + for (; compressor != compressors.end(); ++compressor) + if (compressor->Name == name) + break; + if (compressor == compressors.end() || + ExecCompressor(*compressor, NULL /*&(d->compressor_pid)*/, + FileName, iFd, ((Mode & ReadOnly) != ReadOnly)) == false) + return _error->Error("Forking external compressor %s is not implemented for %s", name.c_str(), FileName.c_str()); + d->pipe = true; + } return true; } /*}}}*/ @@ -926,12 +1139,14 @@ bool FileFd::Read(void *To,unsigned long long Size,unsigned long long *Actual) errno = 0; if (Actual != 0) *Actual = 0; - + *((char *)To) = '\0'; do { +#ifdef APT_USE_ZLIB if (d->gz != NULL) Res = gzread(d->gz,To,Size); else +#endif Res = read(iFd,To,Size); if (Res < 0 && errno == EINTR) continue; @@ -968,8 +1183,11 @@ bool FileFd::Read(void *To,unsigned long long Size,unsigned long long *Actual) files because of the naive implementation! */ char* FileFd::ReadLine(char *To, unsigned long long const Size) { + *To = '\0'; +#ifdef APT_USE_ZLIB if (d->gz != NULL) return gzgets(d->gz, To, Size); +#endif unsigned long long read = 0; if (Read(To, Size, &read) == false) @@ -993,9 +1211,11 @@ bool FileFd::Write(const void *From,unsigned long long Size) errno = 0; do { +#ifdef APT_USE_ZLIB if (d->gz != NULL) Res = gzwrite(d->gz,From,Size); else +#endif Res = write(iFd,From,Size); if (Res < 0 && errno == EINTR) continue; @@ -1022,10 +1242,21 @@ bool FileFd::Write(const void *From,unsigned long long Size) /* */ bool FileFd::Seek(unsigned long long To) { + if (d->pipe == true) + { + // FIXME: What about OpenDescriptor() stuff here? + close(iFd); + bool result = ExecCompressor(d->compressor, NULL, FileName, iFd, (d->openmode & ReadOnly) != ReadOnly); + if (result == true && To != 0) + result &= Skip(To); + return result; + } int res; +#ifdef USE_ZLIB if (d->gz) res = gzseek(d->gz,To,SEEK_SET); else +#endif res = lseek(iFd,To,SEEK_SET); if (res != (signed)To) { @@ -1042,9 +1273,11 @@ bool FileFd::Seek(unsigned long long To) bool FileFd::Skip(unsigned long long Over) { int res; +#ifdef USE_ZLIB if (d->gz != NULL) res = gzseek(d->gz,Over,SEEK_CUR); else +#endif res = lseek(iFd,Over,SEEK_CUR); if (res < 0) { @@ -1080,9 +1313,11 @@ bool FileFd::Truncate(unsigned long long To) unsigned long long FileFd::Tell() { off_t Res; +#ifdef USE_ZLIB if (d->gz != NULL) Res = gztell(d->gz); else +#endif Res = lseek(iFd,0,SEEK_CUR); if (Res == (off_t)-1) _error->Errno("lseek","Failed to determine the current file position"); @@ -1095,9 +1330,19 @@ unsigned long long FileFd::Tell() unsigned long long FileFd::FileSize() { struct stat Buf; - - if (fstat(iFd,&Buf) != 0) + if (d->pipe == false && fstat(iFd,&Buf) != 0) return _error->Errno("fstat","Unable to determine the file size"); + + // for compressor pipes st_size is undefined and at 'best' zero + if (d->pipe == true || S_ISFIFO(Buf.st_mode)) + { + // we set it here, too, as we get the info here for free + // in theory the Open-methods should take care of it already + d->pipe = true; + if (stat(FileName.c_str(), &Buf) != 0) + return _error->Errno("stat","Unable to determine the file size"); + } + return Buf.st_size; } /*}}}*/ @@ -1108,10 +1353,25 @@ unsigned long long FileFd::Size() { unsigned long long size = FileSize(); + // for compressor pipes st_size is undefined and at 'best' zero, + // so we 'read' the content and 'seek' back - see there + if (d->pipe == true) + { + // FIXME: If we have read first and then FileSize() the report is wrong + size = 0; + char ignore[1000]; + unsigned long long read = 0; + do { + Read(ignore, sizeof(ignore), &read); + size += read; + } while(read != 0); + Seek(0); + } +#ifdef USE_ZLIB // only check gzsize if we are actually a gzip file, just checking for // "gz" is not sufficient as uncompressed files could be opened with // gzopen in "direct" mode as well - if (d->gz && !gzdirect(d->gz) && size > 0) + else if (d->gz && !gzdirect(d->gz) && size > 0) { /* unfortunately zlib.h doesn't provide a gzsize(), so we have to do * this ourselves; the original (uncompressed) file size is the last 32 @@ -1135,6 +1395,7 @@ unsigned long long FileFd::Size() return _error->Errno("lseek","Unable to seek in gzipped file"); return size; } +#endif return size; } @@ -1145,11 +1406,25 @@ unsigned long long FileFd::Size() time_t FileFd::ModificationTime() { struct stat Buf; - if (fstat(iFd,&Buf) != 0) + if (d->pipe == false && fstat(iFd,&Buf) != 0) { _error->Errno("fstat","Unable to determine the modification time of file %s", FileName.c_str()); return 0; } + + // for compressor pipes st_size is undefined and at 'best' zero + if (d->pipe == true || S_ISFIFO(Buf.st_mode)) + { + // we set it here, too, as we get the info here for free + // in theory the Open-methods should take care of it already + d->pipe = true; + if (stat(FileName.c_str(), &Buf) != 0) + { + _error->Errno("fstat","Unable to determine the modification time of file %s", FileName.c_str()); + return 0; + } + } + return Buf.st_mtime; } /*}}}*/ @@ -1164,12 +1439,14 @@ bool FileFd::Close() bool Res = true; if ((Flags & AutoClose) == AutoClose) { +#ifdef USE_ZLIB if (d != NULL && d->gz != NULL) { int const e = gzclose(d->gz); // gzdopen() on empty files always fails with "buffer error" here, ignore that if (e != 0 && e != Z_BUF_ERROR) Res &= _error->Errno("close",_("Problem closing the gzip file %s"), FileName.c_str()); } else +#endif if (iFd > 0 && close(iFd) != 0) Res &= _error->Errno("close",_("Problem closing the file %s"), FileName.c_str()); } @@ -1191,6 +1468,8 @@ bool FileFd::Close() if (d != NULL) { +// if (d->compressor_pid != -1) +// ExecWait(d->compressor_pid, "FileFdCompressor", true); delete d; d = NULL; } @@ -1210,4 +1489,5 @@ bool FileFd::Sync() return true; } /*}}}*/ -gzFile FileFd::gzFd() {return d->gz;}; + +gzFile FileFd::gzFd() { return (gzFile) d->gz; } diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h index 209ca91e7..f96dc72dc 100644 --- a/apt-pkg/contrib/fileutl.h +++ b/apt-pkg/contrib/fileutl.h @@ -22,6 +22,7 @@ #define PKGLIB_FILEUTL_H #include <apt-pkg/macros.h> +#include <apt-pkg/aptconfiguration.h> #include <string> #include <vector> @@ -110,6 +111,7 @@ class FileFd inline int Fd() {return iFd;}; inline void Fd(int fd) {iFd = fd;}; __deprecated gzFile gzFd(); + inline bool IsOpen() {return iFd >= 0;}; inline bool Failed() {return (Flags & Fail) == Fail;}; inline void EraseOnFailure() {Flags |= DelOnFail;}; @@ -170,6 +172,14 @@ bool WaitFd(int Fd,bool write = false,unsigned long timeout = 0); pid_t ExecFork(); bool ExecWait(pid_t Pid,const char *Name,bool Reap = false); +bool ExecCompressor(APT::Configuration::Compressor const &Prog, + pid_t *Pid, int const FileFd, int &OutFd, bool const Comp = true); +inline bool ExecDecompressor(APT::Configuration::Compressor const &Prog, + pid_t *Pid, int const FileFd, int &OutFd) +{ + return ExecCompressor(Prog, Pid, FileFd, OutFd, true); +} + // File string manipulators std::string flNotDir(std::string File); std::string flNotFile(std::string File); diff --git a/apt-pkg/contrib/mmap.cc b/apt-pkg/contrib/mmap.cc index 1fb84b0af..a67ab3698 100644 --- a/apt-pkg/contrib/mmap.cc +++ b/apt-pkg/contrib/mmap.cc @@ -66,7 +66,7 @@ MMap::~MMap() bool MMap::Map(FileFd &Fd) { iSize = Fd.Size(); - + // Set the permissions. int Prot = PROT_READ; int Map = MAP_SHARED; @@ -97,6 +97,13 @@ bool MMap::Map(FileFd &Fd) { // The filesystem doesn't support this particular kind of mmap. // So we allocate a buffer and read the whole file into it. + if ((Flags & ReadOnly) == ReadOnly) + { + // for readonly, we don't need sync, so make it simple + Base = new unsigned char[iSize]; + return Fd.Read(Base, iSize); + } + // FIXME: Writing to compressed fd's ? int const dupped_fd = dup(Fd.Fd()); if (dupped_fd == -1) return _error->Errno("mmap", _("Couldn't duplicate file descriptor %i"), Fd.Fd()); diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index 28568d5e3..bdb50f6bf 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -773,6 +773,7 @@ bool debListParser::LoadReleaseInfo(pkgCache::PkgFileIterator &FileI, // file. to provide Component pinning we use the section name now FileI->Component = WriteUniqString(component); + // FIXME: Code depends on the fact that Release files aren't compressed FILE* release = fdopen(dup(File.Fd()), "r"); if (release == NULL) return false; diff --git a/apt-pkg/indexcopy.cc b/apt-pkg/indexcopy.cc index f6457aa39..3747e3570 100644 --- a/apt-pkg/indexcopy.cc +++ b/apt-pkg/indexcopy.cc @@ -38,65 +38,6 @@ using namespace std; -// DecompressFile - wrapper for decompressing compressed files /*{{{*/ -// --------------------------------------------------------------------- -/* */ -bool DecompressFile(string Filename, int *fd, off_t *FileSize) -{ - struct stat Buf; - *fd = -1; - - std::vector<APT::Configuration::Compressor> const compressor = APT::Configuration::getCompressors(); - std::vector<APT::Configuration::Compressor>::const_iterator UnCompress; - std::string file = std::string(Filename).append(UnCompress->Extension); - for (UnCompress = compressor.begin(); UnCompress != compressor.end(); ++UnCompress) - { - if (stat(file.c_str(), &Buf) == 0) - break; - } - - if (UnCompress == compressor.end()) - return _error->Errno("decompressor", "Unable to parse file"); - - *FileSize = Buf.st_size; - - // Create a data pipe - int Pipe[2] = {-1,-1}; - if (pipe(Pipe) != 0) - return _error->Errno("pipe",_("Failed to create subprocess IPC")); - for (int J = 0; J != 2; J++) - SetCloseExec(Pipe[J],true); - - *fd = Pipe[1]; - - // The child.. - pid_t Pid = ExecFork(); - if (Pid == 0) - { - dup2(Pipe[1],STDOUT_FILENO); - SetCloseExec(STDOUT_FILENO, false); - - std::vector<char const*> Args; - Args.push_back(UnCompress->Binary.c_str()); - for (std::vector<std::string>::const_iterator a = UnCompress->UncompressArgs.begin(); - a != UnCompress->UncompressArgs.end(); ++a) - Args.push_back(a->c_str()); - Args.push_back("--stdout"); - Args.push_back(file.c_str()); - Args.push_back(NULL); - - execvp(Args[0],(char **)&Args[0]); - cerr << _("Failed to exec compressor ") << Args[0] << endl; - _exit(100); - } - - // Wait for decompress to finish - if (ExecWait(Pid, UnCompress->Binary.c_str(), false) == false) - return false; - - return true; -} - /*}}}*/ // IndexCopy::CopyPackages - Copy the package files from the CD /*{{{*/ // --------------------------------------------------------------------- /* */ @@ -142,24 +83,10 @@ bool IndexCopy::CopyPackages(string CDROM,string Name,vector<string> &List, for (vector<string>::iterator I = List.begin(); I != List.end(); ++I) { string OrigPath = string(*I,CDROM.length()); - off_t FileSize = 0; // Open the package file - FileFd Pkg; - if (RealFileExists(*I + GetFileName()) == true) - { - Pkg.Open(*I + GetFileName(),FileFd::ReadOnly); - FileSize = Pkg.Size(); - } - else - { - int fd; - if (!DecompressFile(string(*I + GetFileName()), &fd, &FileSize)) - return _error->Errno("decompress","Decompress failed for %s", - string(*I + GetFileName()).c_str()); - Pkg.Fd(dup(fd)); - Pkg.Seek(0); - } + FileFd Pkg(*I + GetFileName(), FileFd::ReadOnly, FileFd::Extension); + off_t const FileSize = Pkg.Size(); pkgTagFile Parser(&Pkg); if (_error->PendingError() == true) @@ -868,23 +795,11 @@ bool TranslationsCopy::CopyTranslations(string CDROM,string Name, /*{{{*/ for (vector<string>::iterator I = List.begin(); I != List.end(); ++I) { string OrigPath = string(*I,CDROM.length()); - off_t FileSize = 0; - + // Open the package file - FileFd Pkg; - if (RealFileExists(*I) == true) - { - Pkg.Open(*I,FileFd::ReadOnly); - FileSize = Pkg.Size(); - } - else - { - int fd; - if (!DecompressFile(*I, &fd, &FileSize)) - return _error->Errno("decompress","Decompress failed for %s", (*I).c_str()); - Pkg.Fd(dup(fd)); - Pkg.Seek(0); - } + FileFd Pkg(*I, FileFd::ReadOnly, FileFd::Extension); + off_t const FileSize = Pkg.Size(); + pkgTagFile Parser(&Pkg); if (_error->PendingError() == true) return false; diff --git a/ftparchive/multicompress.cc b/ftparchive/multicompress.cc index bf0f858d9..37a713efd 100644 --- a/ftparchive/multicompress.cc +++ b/ftparchive/multicompress.cc @@ -16,6 +16,7 @@ // Include Files /*{{{*/ #include <config.h> +#include <apt-pkg/fileutl.h> #include <apt-pkg/strutl.h> #include <apt-pkg/error.h> #include <apt-pkg/md5.h> @@ -261,73 +262,6 @@ bool MultiCompress::Finalize(unsigned long long &OutSize) return true; } /*}}}*/ -// MultiCompress::OpenCompress - Open the compressor /*{{{*/ -// --------------------------------------------------------------------- -/* This opens the compressor, either in compress mode or decompress - mode. FileFd is always the compressor input/output file, - OutFd is the created pipe, Input for Compress, Output for Decompress. */ -bool MultiCompress::OpenCompress(APT::Configuration::Compressor const &Prog, - pid_t &Pid,int const &FileFd,int &OutFd,bool const &Comp) -{ - Pid = -1; - - // No compression - if (Prog.Binary.empty() == true) - { - OutFd = dup(FileFd); - return true; - } - - // Create a data pipe - int Pipe[2] = {-1,-1}; - if (pipe(Pipe) != 0) - return _error->Errno("pipe",_("Failed to create subprocess IPC")); - for (int J = 0; J != 2; J++) - SetCloseExec(Pipe[J],true); - - if (Comp == true) - OutFd = Pipe[1]; - else - OutFd = Pipe[0]; - - // The child.. - Pid = ExecFork(); - if (Pid == 0) - { - if (Comp == true) - { - dup2(FileFd,STDOUT_FILENO); - dup2(Pipe[0],STDIN_FILENO); - } - else - { - dup2(FileFd,STDIN_FILENO); - dup2(Pipe[1],STDOUT_FILENO); - } - - SetCloseExec(STDOUT_FILENO,false); - SetCloseExec(STDIN_FILENO,false); - - std::vector<char const*> Args; - Args.push_back(Prog.Binary.c_str()); - std::vector<std::string> const * const addArgs = - (Comp == true) ? &(Prog.CompressArgs) : &(Prog.UncompressArgs); - for (std::vector<std::string>::const_iterator a = addArgs->begin(); - a != addArgs->end(); ++a) - Args.push_back(a->c_str()); - Args.push_back(NULL); - - execvp(Args[0],(char **)&Args[0]); - cerr << _("Failed to exec compressor ") << Args[0] << endl; - _exit(100); - }; - if (Comp == true) - close(Pipe[0]); - else - close(Pipe[1]); - return true; -} - /*}}}*/ // MultiCompress::OpenOld - Open an old file /*{{{*/ // --------------------------------------------------------------------- /* This opens one of the original output files, possibly decompressing it. */ @@ -344,7 +278,7 @@ bool MultiCompress::OpenOld(int &Fd,pid_t &Proc) return false; // Decompress the file so we can read it - if (OpenCompress(Best->CompressProg,Proc,F.Fd(),Fd,false) == false) + if (ExecCompressor(Best->CompressProg,&Proc,F.Fd(),Fd,false) == false) return false; return true; @@ -374,8 +308,8 @@ bool MultiCompress::Child(int const &FD) // Start the compression children. for (Files *I = Outputs; I != 0; I = I->Next) { - if (OpenCompress(I->CompressProg,I->CompressProc,I->TmpFile.Fd(), - I->Fd,true) == false) + if (ExecCompressor(I->CompressProg,&(I->CompressProc),I->TmpFile.Fd(), + I->Fd,true) == false) return false; } diff --git a/ftparchive/multicompress.h b/ftparchive/multicompress.h index 5496b06d0..ac8bd0746 100644 --- a/ftparchive/multicompress.h +++ b/ftparchive/multicompress.h @@ -41,8 +41,6 @@ class MultiCompress pid_t Outputter; mode_t Permissions; - bool OpenCompress(APT::Configuration::Compressor const &Prog, - pid_t &Pid,int const &FileFd, int &OutFd,bool const &Comp); bool Child(int const &Fd); bool Start(); bool Die(); -- cgit v1.2.3-70-g09d2 From a4f6bdc8bd91c7282ae9ac60c44844c6f0058a65 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Tue, 13 Dec 2011 00:54:37 +0100 Subject: revert 2184.1.2: do not pollute namespace in headers The breakage is just to big for now, so guard the change with #ifndef APT_8_CLEANER_HEADERS and be nice to library users --- apt-inst/contrib/extracttar.h | 4 ++++ apt-pkg/acquire.h | 5 +++++ apt-pkg/algorithms.h | 4 ++++ apt-pkg/cdrom.h | 4 ++++ apt-pkg/contrib/cdromutl.h | 4 ++++ apt-pkg/contrib/configuration.h | 4 ++++ apt-pkg/contrib/fileutl.h | 4 ++++ apt-pkg/contrib/hashes.h | 6 ++++++ apt-pkg/contrib/hashsum_template.h | 5 +++++ apt-pkg/contrib/md5.h | 5 +++++ apt-pkg/contrib/mmap.h | 4 ++++ apt-pkg/contrib/progress.h | 4 ++++ apt-pkg/contrib/sha1.h | 5 +++++ apt-pkg/contrib/strutl.h | 6 ++++++ apt-pkg/deb/dpkgpm.h | 5 +++++ apt-pkg/indexcopy.h | 5 +++++ apt-pkg/indexfile.h | 4 ++++ apt-pkg/metaindex.h | 4 ++++ apt-pkg/packagemanager.h | 4 ++++ apt-pkg/pkgcache.h | 5 ++++- apt-pkg/policy.h | 4 ++++ apt-pkg/srcrecords.h | 5 +++++ apt-pkg/vendor.h | 4 ++++ apt-pkg/vendorlist.h | 5 +++++ apt-pkg/version.h | 4 ++++ apt-pkg/versionmatch.h | 4 ++++ 26 files changed, 116 insertions(+), 1 deletion(-) diff --git a/apt-inst/contrib/extracttar.h b/apt-inst/contrib/extracttar.h index 8754e8dcc..e104417c1 100644 --- a/apt-inst/contrib/extracttar.h +++ b/apt-inst/contrib/extracttar.h @@ -18,6 +18,10 @@ #include <string> +#ifndef APT_8_CLEANER_HEADERS +using std::min; +#endif + class pkgDirStream; class ExtractTar diff --git a/apt-pkg/acquire.h b/apt-pkg/acquire.h index 93772403d..3d5d7a4b7 100644 --- a/apt-pkg/acquire.h +++ b/apt-pkg/acquire.h @@ -75,6 +75,11 @@ #include <sys/time.h> #include <unistd.h> +#ifndef APT_8_CLEANER_HEADERS +using std::vector; +using std::string; +#endif + class pkgAcquireStatus; /** \brief The core download scheduler. {{{ diff --git a/apt-pkg/algorithms.h b/apt-pkg/algorithms.h index 948fe1103..fdb64fc59 100644 --- a/apt-pkg/algorithms.h +++ b/apt-pkg/algorithms.h @@ -36,6 +36,10 @@ #include <iostream> +#ifndef APT_8_CLEANER_HEADERS +using std::ostream; +#endif + class pkgAcquireStatus; class pkgSimulate : public pkgPackageManager /*{{{*/ diff --git a/apt-pkg/cdrom.h b/apt-pkg/cdrom.h index 319254fd0..4fcf5abcd 100644 --- a/apt-pkg/cdrom.h +++ b/apt-pkg/cdrom.h @@ -4,6 +4,10 @@ #include<string> #include<vector> +#ifndef APT_8_CLEANER_HEADERS +using namespace std; +#endif + class Configuration; class OpProgress; diff --git a/apt-pkg/contrib/cdromutl.h b/apt-pkg/contrib/cdromutl.h index 2c6afac0f..e94045b5c 100644 --- a/apt-pkg/contrib/cdromutl.h +++ b/apt-pkg/contrib/cdromutl.h @@ -12,6 +12,10 @@ #include <string> +#ifndef APT_8_CLEANER_HEADERS +using std::string; +#endif + // mount cdrom, DeviceName (e.g. /dev/sr0) is optional bool MountCdrom(std::string Path, std::string DeviceName=""); bool UnmountCdrom(std::string Path); diff --git a/apt-pkg/contrib/configuration.h b/apt-pkg/contrib/configuration.h index f6f2a3c1d..4c2e75041 100644 --- a/apt-pkg/contrib/configuration.h +++ b/apt-pkg/contrib/configuration.h @@ -34,6 +34,10 @@ #include <vector> #include <iostream> +#ifndef APT_8_CLEANER_HEADERS +using std::string; +#endif + class Configuration { public: diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h index f96dc72dc..8a986b82b 100644 --- a/apt-pkg/contrib/fileutl.h +++ b/apt-pkg/contrib/fileutl.h @@ -29,6 +29,10 @@ #include <zlib.h> +#ifndef APT_8_CLEANER_HEADERS +using std::string; +#endif + /* Define this for python-apt */ #define APT_HAS_GZIP 1 diff --git a/apt-pkg/contrib/hashes.h b/apt-pkg/contrib/hashes.h index 81851dede..b206eccb8 100644 --- a/apt-pkg/contrib/hashes.h +++ b/apt-pkg/contrib/hashes.h @@ -22,6 +22,12 @@ #include <vector> #include <cstring> + +#ifndef APT_8_CLEANER_HEADERS +using std::min; +using std::vector; +#endif + // helper class that contains hash function name // and hash class HashString diff --git a/apt-pkg/contrib/hashsum_template.h b/apt-pkg/contrib/hashsum_template.h index 27d192b82..6301ac9d0 100644 --- a/apt-pkg/contrib/hashsum_template.h +++ b/apt-pkg/contrib/hashsum_template.h @@ -15,6 +15,11 @@ #include <algorithm> #include <stdint.h> +#ifndef APT_8_CLEANER_HEADERS +using std::string; +using std::min; +#endif + template<int N> class HashSumValue { diff --git a/apt-pkg/contrib/md5.h b/apt-pkg/contrib/md5.h index a207da4e4..25631b166 100644 --- a/apt-pkg/contrib/md5.h +++ b/apt-pkg/contrib/md5.h @@ -31,6 +31,11 @@ #include "hashsum_template.h" +#ifndef APT_8_CLEANER_HEADERS +using std::string; +using std::min; +#endif + typedef HashSumValue<128> MD5SumValue; class MD5Summation : public SummationImplementation diff --git a/apt-pkg/contrib/mmap.h b/apt-pkg/contrib/mmap.h index 2ed4a95f8..602de94f8 100644 --- a/apt-pkg/contrib/mmap.h +++ b/apt-pkg/contrib/mmap.h @@ -28,6 +28,10 @@ #include <string> +#ifndef APT_8_CLEANER_HEADERS +using std::string; +#endif + class FileFd; /* This should be a 32 bit type, larger tyes use too much ram and smaller diff --git a/apt-pkg/contrib/progress.h b/apt-pkg/contrib/progress.h index 7635719bc..3a6943aee 100644 --- a/apt-pkg/contrib/progress.h +++ b/apt-pkg/contrib/progress.h @@ -25,6 +25,10 @@ #include <string> #include <sys/time.h> +#ifndef APT_8_CLEANER_HEADERS +using std::string; +#endif + class Configuration; class OpProgress { diff --git a/apt-pkg/contrib/sha1.h b/apt-pkg/contrib/sha1.h index b4b139a22..a8d55eb13 100644 --- a/apt-pkg/contrib/sha1.h +++ b/apt-pkg/contrib/sha1.h @@ -20,6 +20,11 @@ #include "hashsum_template.h" +#ifndef APT_8_CLEANER_HEADERS +using std::string; +using std::min; +#endif + typedef HashSumValue<160> SHA1SumValue; class SHA1Summation : public SummationImplementation diff --git a/apt-pkg/contrib/strutl.h b/apt-pkg/contrib/strutl.h index 93f4bef4f..337139d5d 100644 --- a/apt-pkg/contrib/strutl.h +++ b/apt-pkg/contrib/strutl.h @@ -27,6 +27,12 @@ #include "macros.h" +#ifndef APT_8_CLEANER_HEADERS +using std::string; +using std::vector; +using std::ostream; +#endif + bool UTF8ToCodeset(const char *codeset, const std::string &orig, std::string *dest); char *_strstrip(char *String); char *_strtabexpand(char *String,size_t Len); diff --git a/apt-pkg/deb/dpkgpm.h b/apt-pkg/deb/dpkgpm.h index 6b62360b7..aab39f633 100644 --- a/apt-pkg/deb/dpkgpm.h +++ b/apt-pkg/deb/dpkgpm.h @@ -15,6 +15,11 @@ #include <map> #include <stdio.h> +#ifndef APT_8_CLEANER_HEADERS +using std::vector; +using std::map; +#endif + class pkgDPkgPMPrivate; class pkgDPkgPM : public pkgPackageManager diff --git a/apt-pkg/indexcopy.h b/apt-pkg/indexcopy.h index 21294ae7e..e3de1afd9 100644 --- a/apt-pkg/indexcopy.h +++ b/apt-pkg/indexcopy.h @@ -14,6 +14,11 @@ #include <string> #include <stdio.h> +#ifndef APT_8_CLEANER_HEADERS +using std::string; +using std::vector; +#endif + class pkgTagSection; class FileFd; class indexRecords; diff --git a/apt-pkg/indexfile.h b/apt-pkg/indexfile.h index 5e162a846..1d34dc773 100644 --- a/apt-pkg/indexfile.h +++ b/apt-pkg/indexfile.h @@ -29,6 +29,10 @@ #include <apt-pkg/pkgrecords.h> #include <apt-pkg/macros.h> +#ifndef APT_8_CLEANER_HEADERS +using std::string; +#endif + class pkgAcquire; class pkgCacheGenerator; class OpProgress; diff --git a/apt-pkg/metaindex.h b/apt-pkg/metaindex.h index 9cc79a7a6..0f95257e0 100644 --- a/apt-pkg/metaindex.h +++ b/apt-pkg/metaindex.h @@ -6,6 +6,10 @@ #include <apt-pkg/pkgcache.h> #include <apt-pkg/indexfile.h> +#ifndef APT_8_CLEANER_HEADERS +using std::string; +#endif + class pkgAcquire; class pkgCacheGenerator; class OpProgress; diff --git a/apt-pkg/packagemanager.h b/apt-pkg/packagemanager.h index d4989a6e0..1d807795d 100644 --- a/apt-pkg/packagemanager.h +++ b/apt-pkg/packagemanager.h @@ -29,6 +29,10 @@ #include <iostream> #include <set> +#ifndef APT_8_CLEANER_HEADERS +using std::string; +#endif + class pkgAcquire; class pkgDepCache; class pkgSourceList; diff --git a/apt-pkg/pkgcache.h b/apt-pkg/pkgcache.h index fd1a02149..1a7013551 100644 --- a/apt-pkg/pkgcache.h +++ b/apt-pkg/pkgcache.h @@ -74,11 +74,14 @@ #ifndef PKGLIB_PKGCACHE_H #define PKGLIB_PKGCACHE_H - #include <string> #include <time.h> #include <apt-pkg/mmap.h> +#ifndef APT_8_CLEANER_HEADERS +using std::string; +#endif + class pkgVersioningSystem; class pkgCache /*{{{*/ { diff --git a/apt-pkg/policy.h b/apt-pkg/policy.h index 3c8246e3b..5172a3c3b 100644 --- a/apt-pkg/policy.h +++ b/apt-pkg/policy.h @@ -38,6 +38,10 @@ #include <apt-pkg/versionmatch.h> #include <vector> +#ifndef APT_8_CLEANER_HEADERS +using std::vector; +#endif + class pkgPolicy : public pkgDepCache::Policy { protected: diff --git a/apt-pkg/srcrecords.h b/apt-pkg/srcrecords.h index a55bc74fa..06f0dce6c 100644 --- a/apt-pkg/srcrecords.h +++ b/apt-pkg/srcrecords.h @@ -17,6 +17,11 @@ #include <string> #include <vector> +#ifndef APT_8_CLEANER_HEADERS +using std::string; +using std::vector; +#endif + class pkgSourceList; class pkgIndexFile; class pkgSrcRecords diff --git a/apt-pkg/vendor.h b/apt-pkg/vendor.h index 9b157378c..6484adf9b 100644 --- a/apt-pkg/vendor.h +++ b/apt-pkg/vendor.h @@ -6,6 +6,10 @@ #include <apt-pkg/macros.h> +#ifndef APT_8_CLEANER_HEADERS +using std::string; +#endif + // A class representing a particular software provider. class __deprecated Vendor { diff --git a/apt-pkg/vendorlist.h b/apt-pkg/vendorlist.h index 733d23a32..4e050477f 100644 --- a/apt-pkg/vendorlist.h +++ b/apt-pkg/vendorlist.h @@ -17,6 +17,11 @@ #include <vector> #include <apt-pkg/macros.h> +#ifndef APT_8_CLEANER_HEADERS +using std::string; +using std::vector; +#endif + class Vendor; class Configuration; diff --git a/apt-pkg/version.h b/apt-pkg/version.h index 92dbc2576..e0e0e6c14 100644 --- a/apt-pkg/version.h +++ b/apt-pkg/version.h @@ -23,6 +23,10 @@ #include <apt-pkg/strutl.h> #include <string> +#ifndef APT_8_CLEANER_HEADERS +using std::string; +#endif + class pkgVersioningSystem { public: diff --git a/apt-pkg/versionmatch.h b/apt-pkg/versionmatch.h index da103fc5b..433396fc9 100644 --- a/apt-pkg/versionmatch.h +++ b/apt-pkg/versionmatch.h @@ -39,6 +39,10 @@ #include <string> #include <apt-pkg/pkgcache.h> +#ifndef APT_8_CLEANER_HEADERS +using std::string; +#endif + class pkgVersionMatch { // Version Matching -- cgit v1.2.3-70-g09d2 From b9dadc24b9477b466bc8058c765d76c65ecc7125 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Tue, 13 Dec 2011 01:22:38 +0100 Subject: revert 2184.1.3: forward declaration instead of headers The breakage is just to big for now, so guard the change with #ifndef APT_8_CLEANER_HEADERS and be nice to library users --- apt-inst/contrib/arfile.h | 3 +++ apt-inst/contrib/extracttar.h | 2 ++ apt-inst/database.h | 4 ++++ apt-inst/deb/debfile.h | 4 ++++ apt-pkg/acquire-item.h | 8 ++++++++ apt-pkg/acquire-method.h | 5 +++++ apt-pkg/algorithms.h | 1 + apt-pkg/cachefile.h | 6 ++++++ apt-pkg/cacheset.h | 4 ++++ apt-pkg/cdrom.h | 1 + apt-pkg/contrib/cmndline.h | 4 ++++ apt-pkg/contrib/mmap.h | 1 + apt-pkg/contrib/netrc.h | 4 ++++ apt-pkg/deb/deblistparser.h | 4 ++++ apt-pkg/deb/debmetaindex.h | 4 ++++ apt-pkg/deb/debrecords.h | 4 ++++ apt-pkg/depcache.h | 5 +++++ apt-pkg/edsp.h | 5 +++++ apt-pkg/edsp/edspindexfile.h | 4 ++++ apt-pkg/edsp/edsplistparser.h | 6 ++++++ apt-pkg/indexrecords.h | 4 ++++ apt-pkg/init.h | 5 +++++ apt-pkg/metaindex.h | 3 +++ apt-pkg/packagemanager.h | 1 + apt-pkg/pkgsystem.h | 4 ++++ apt-pkg/sourcelist.h | 26 ++++++++++++++------------ apt-pkg/tagfile.h | 4 ++++ apt-pkg/vendorlist.h | 2 ++ 28 files changed, 116 insertions(+), 12 deletions(-) diff --git a/apt-inst/contrib/arfile.h b/apt-inst/contrib/arfile.h index 2be1323d1..0f62a34a0 100644 --- a/apt-inst/contrib/arfile.h +++ b/apt-inst/contrib/arfile.h @@ -17,6 +17,9 @@ #include <string> +#ifndef APT_8_CLEANER_HEADERS +#include <apt-pkg/fileutl.h> +#endif class FileFd; diff --git a/apt-inst/contrib/extracttar.h b/apt-inst/contrib/extracttar.h index e104417c1..4b29df314 100644 --- a/apt-inst/contrib/extracttar.h +++ b/apt-inst/contrib/extracttar.h @@ -19,6 +19,8 @@ #include <string> #ifndef APT_8_CLEANER_HEADERS +#include <apt-pkg/dirstream.h> +#include <algorithm> using std::min; #endif diff --git a/apt-inst/database.h b/apt-inst/database.h index ccfee3797..64e149f98 100644 --- a/apt-inst/database.h +++ b/apt-inst/database.h @@ -25,6 +25,10 @@ #include <string> +#ifndef APT_8_CLEANER_HEADERS +#include <apt-pkg/filelist.h> +#endif + class pkgFLCache; class OpProgress; diff --git a/apt-inst/deb/debfile.h b/apt-inst/deb/debfile.h index 2c4734f9e..5e1ea1d2f 100644 --- a/apt-inst/deb/debfile.h +++ b/apt-inst/deb/debfile.h @@ -29,6 +29,10 @@ #include <apt-pkg/tagfile.h> #include <apt-pkg/pkgcache.h> +#ifndef APT_8_CLEANER_HEADERS +#include <apt-pkg/database.h> +#endif + class FileFd; class pkgDataBase; diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h index 27b8e887b..51d539450 100644 --- a/apt-pkg/acquire-item.h +++ b/apt-pkg/acquire-item.h @@ -25,6 +25,14 @@ #include <apt-pkg/weakptr.h> #include <apt-pkg/pkgcache.h> +#ifndef APT_8_CLEANER_HEADERS +#include <apt-pkg/indexfile.h> +#include <apt-pkg/vendor.h> +#include <apt-pkg/sourcelist.h> +#include <apt-pkg/pkgrecords.h> +#include <apt-pkg/indexrecords.h> +#endif + /** \addtogroup acquire * @{ * diff --git a/apt-pkg/acquire-method.h b/apt-pkg/acquire-method.h index c3f042ee0..2dd9ad685 100644 --- a/apt-pkg/acquire-method.h +++ b/apt-pkg/acquire-method.h @@ -25,6 +25,11 @@ #include <string> #include <vector> +#ifndef APT_8_CLEANER_HEADERS +#include <apt-pkg/configuration.h> +#include <apt-pkg/strutl.h> +#endif + class Hashes; class pkgAcqMethod { diff --git a/apt-pkg/algorithms.h b/apt-pkg/algorithms.h index fdb64fc59..185d11e96 100644 --- a/apt-pkg/algorithms.h +++ b/apt-pkg/algorithms.h @@ -37,6 +37,7 @@ #include <iostream> #ifndef APT_8_CLEANER_HEADERS +#include <apt-pkg/acquire.h> using std::ostream; #endif diff --git a/apt-pkg/cachefile.h b/apt-pkg/cachefile.h index b56e42855..802b12b61 100644 --- a/apt-pkg/cachefile.h +++ b/apt-pkg/cachefile.h @@ -20,6 +20,12 @@ #include <apt-pkg/depcache.h> #include <apt-pkg/macros.h> +#ifndef APT_8_CLEANER_HEADERS +#include <apt-pkg/acquire.h> +#include <apt-pkg/policy.h> +#include <apt-pkg/sourcelist.h> +#endif + class pkgPolicy; class pkgSourceList; class OpProgress; diff --git a/apt-pkg/cacheset.h b/apt-pkg/cacheset.h index d1e396e0f..91d7eec1c 100644 --- a/apt-pkg/cacheset.h +++ b/apt-pkg/cacheset.h @@ -20,6 +20,10 @@ #include <apt-pkg/error.h> #include <apt-pkg/pkgcache.h> + +#ifndef APT_8_CLEANER_HEADERS +#include <apt-pkg/cachefile.h> +#endif /*}}}*/ class pkgCacheFile; diff --git a/apt-pkg/cdrom.h b/apt-pkg/cdrom.h index 4fcf5abcd..cedfccff7 100644 --- a/apt-pkg/cdrom.h +++ b/apt-pkg/cdrom.h @@ -5,6 +5,7 @@ #include<vector> #ifndef APT_8_CLEANER_HEADERS +#include <apt-pkg/init.h> using namespace std; #endif diff --git a/apt-pkg/contrib/cmndline.h b/apt-pkg/contrib/cmndline.h index b201d9855..9f505fd41 100644 --- a/apt-pkg/contrib/cmndline.h +++ b/apt-pkg/contrib/cmndline.h @@ -44,6 +44,10 @@ #ifndef PKGLIB_CMNDLINE_H #define PKGLIB_CMNDLINE_H +#ifndef APT_8_CLEANER_HEADERS +#include <apt-pkg/configuration.h> +#endif + class Configuration; class CommandLine diff --git a/apt-pkg/contrib/mmap.h b/apt-pkg/contrib/mmap.h index 602de94f8..6bd4a2d86 100644 --- a/apt-pkg/contrib/mmap.h +++ b/apt-pkg/contrib/mmap.h @@ -29,6 +29,7 @@ #include <string> #ifndef APT_8_CLEANER_HEADERS +#include <apt-pkg/fileutl.h> using std::string; #endif diff --git a/apt-pkg/contrib/netrc.h b/apt-pkg/contrib/netrc.h index 7b94eba88..5931d4a42 100644 --- a/apt-pkg/contrib/netrc.h +++ b/apt-pkg/contrib/netrc.h @@ -16,6 +16,10 @@ #include <string> +#ifndef APT_8_CLEANER_HEADERS +#include <apt-pkg/strutl.h> +#endif + #define DOT_CHAR "." #define DIR_CHAR "/" diff --git a/apt-pkg/deb/deblistparser.h b/apt-pkg/deb/deblistparser.h index 9519d9711..386d291a2 100644 --- a/apt-pkg/deb/deblistparser.h +++ b/apt-pkg/deb/deblistparser.h @@ -14,6 +14,10 @@ #include <apt-pkg/pkgcachegen.h> #include <apt-pkg/tagfile.h> +#ifndef APT_8_CLEANER_HEADERS +#include <apt-pkg/indexfile.h> +#endif + class debListParser : public pkgCacheGenerator::ListParser { public: diff --git a/apt-pkg/deb/debmetaindex.h b/apt-pkg/deb/debmetaindex.h index 0cba2d8a8..b9ecab97c 100644 --- a/apt-pkg/deb/debmetaindex.h +++ b/apt-pkg/deb/debmetaindex.h @@ -8,6 +8,10 @@ #include <string> #include <vector> +#ifndef APT_8_CLEANER_HEADERS +#include <apt-pkg/sourcelist.h> +#endif + class debReleaseIndex : public metaIndex { public: diff --git a/apt-pkg/deb/debrecords.h b/apt-pkg/deb/debrecords.h index 9c7ea6b48..b5e3bbdba 100644 --- a/apt-pkg/deb/debrecords.h +++ b/apt-pkg/deb/debrecords.h @@ -18,6 +18,10 @@ #include <apt-pkg/tagfile.h> #include <apt-pkg/fileutl.h> +#ifndef APT_8_CLEANER_HEADERS +#include <apt-pkg/indexfile.h> +#endif + class debRecordParser : public pkgRecords::Parser { /** \brief dpointer placeholder (for later in case we need it) */ diff --git a/apt-pkg/depcache.h b/apt-pkg/depcache.h index f6e6c0afc..7358048ed 100644 --- a/apt-pkg/depcache.h +++ b/apt-pkg/depcache.h @@ -46,6 +46,11 @@ #include <set> #include <list> +#ifndef APT_8_CLEANER_HEADERS +#include <apt-pkg/progress.h> +#include <apt-pkg/error.h> +#endif + class OpProgress; class pkgDepCache : protected pkgCache::Namespace diff --git a/apt-pkg/edsp.h b/apt-pkg/edsp.h index 07bbbdd03..12b06d143 100644 --- a/apt-pkg/edsp.h +++ b/apt-pkg/edsp.h @@ -15,6 +15,11 @@ #include <list> #include <string> +#ifndef APT_8_CLEANER_HEADERS +#include <apt-pkg/depcache.h> +#include <apt-pkg/progress.h> +#endif + class pkgDepCache; class OpProgress; diff --git a/apt-pkg/edsp/edspindexfile.h b/apt-pkg/edsp/edspindexfile.h index 9670c4837..de10f2d2f 100644 --- a/apt-pkg/edsp/edspindexfile.h +++ b/apt-pkg/edsp/edspindexfile.h @@ -10,6 +10,10 @@ #include <apt-pkg/debindexfile.h> +#ifndef APT_8_CLEANER_HEADERS +#include <apt-pkg/indexfile.h> +#endif + class edspIndex : public debStatusIndex { /** \brief dpointer placeholder (for later in case we need it) */ diff --git a/apt-pkg/edsp/edsplistparser.h b/apt-pkg/edsp/edsplistparser.h index 5d82716c7..a7bf9de95 100644 --- a/apt-pkg/edsp/edsplistparser.h +++ b/apt-pkg/edsp/edsplistparser.h @@ -13,6 +13,12 @@ #include <apt-pkg/deblistparser.h> +#ifndef APT_8_CLEANER_HEADERS +#include <apt-pkg/pkgcachegen.h> +#include <apt-pkg/indexfile.h> +#include <apt-pkg/tagfile.h> +#endif + class FileFd; class edspListParser : public debListParser diff --git a/apt-pkg/indexrecords.h b/apt-pkg/indexrecords.h index fa60a0847..a98b939bc 100644 --- a/apt-pkg/indexrecords.h +++ b/apt-pkg/indexrecords.h @@ -13,6 +13,10 @@ #include <vector> #include <ctime> +#ifndef APT_8_CLEANER_HEADERS +#include <apt-pkg/fileutl.h> +#endif + class indexRecords { bool parseSumData(const char *&Start, const char *End, std::string &Name, diff --git a/apt-pkg/init.h b/apt-pkg/init.h index 0c1c7ae5a..b6f3df753 100644 --- a/apt-pkg/init.h +++ b/apt-pkg/init.h @@ -13,6 +13,11 @@ #ifndef PKGLIB_INIT_H #define PKGLIB_INIT_H +#ifndef APT_8_CLEANER_HEADERS +#include <apt-pkg/configuration.h> +#include <apt-pkg/pkgsystem.h> +#endif + class pkgSystem; class Configuration; diff --git a/apt-pkg/metaindex.h b/apt-pkg/metaindex.h index 0f95257e0..5783735ff 100644 --- a/apt-pkg/metaindex.h +++ b/apt-pkg/metaindex.h @@ -7,6 +7,9 @@ #include <apt-pkg/indexfile.h> #ifndef APT_8_CLEANER_HEADERS +#include <apt-pkg/srcrecords.h> +#include <apt-pkg/pkgrecords.h> +#include <apt-pkg/vendor.h> using std::string; #endif diff --git a/apt-pkg/packagemanager.h b/apt-pkg/packagemanager.h index 1d807795d..1a6a9f01c 100644 --- a/apt-pkg/packagemanager.h +++ b/apt-pkg/packagemanager.h @@ -30,6 +30,7 @@ #include <set> #ifndef APT_8_CLEANER_HEADERS +#include <apt-pkg/depcache.h> using std::string; #endif diff --git a/apt-pkg/pkgsystem.h b/apt-pkg/pkgsystem.h index 211fd0d56..75f7b9fcc 100644 --- a/apt-pkg/pkgsystem.h +++ b/apt-pkg/pkgsystem.h @@ -41,6 +41,10 @@ #include <vector> +#ifndef APT_8_CLEANER_HEADERS +#include <apt-pkg/depcache.h> +#endif + class pkgDepCache; class pkgPackageManager; class pkgVersioningSystem; diff --git a/apt-pkg/sourcelist.h b/apt-pkg/sourcelist.h index 4509e54b9..03e29ec34 100644 --- a/apt-pkg/sourcelist.h +++ b/apt-pkg/sourcelist.h @@ -32,9 +32,11 @@ #include <map> #include <apt-pkg/pkgcache.h> +#ifndef APT_8_CLEANER_HEADERS +#include <apt-pkg/metaindex.h> using std::string; using std::vector; - +#endif class pkgAcquire; class pkgIndexFile; @@ -58,31 +60,31 @@ class pkgSourceList const char *Label; bool FixupURI(string &URI) const; - virtual bool ParseLine(vector<metaIndex *> &List, + virtual bool ParseLine(std::vector<metaIndex *> &List, const char *Buffer, - unsigned long const &CurLine,string const &File) const; - virtual bool CreateItem(vector<metaIndex *> &List,string const &URI, - string const &Dist,string const &Section, - std::map<string, string> const &Options) const = 0; + unsigned long const &CurLine,std::string const &File) const; + virtual bool CreateItem(vector<metaIndex *> &List,std::string const &URI, + std::string const &Dist,std::string const &Section, + std::map<std::string, std::string> const &Options) const = 0; Type(); virtual ~Type() {}; }; - typedef vector<metaIndex *>::const_iterator const_iterator; + typedef std::vector<metaIndex *>::const_iterator const_iterator; protected: - vector<metaIndex *> SrcList; + std::vector<metaIndex *> SrcList; public: bool ReadMainList(); - bool Read(string File); + bool Read(std::string File); // CNC:2003-03-03 void Reset(); - bool ReadAppend(string File); - bool ReadSourceDir(string Dir); + bool ReadAppend(std::string File); + bool ReadSourceDir(std::string Dir); // List accessors inline const_iterator begin() const {return SrcList.begin();}; @@ -98,7 +100,7 @@ class pkgSourceList time_t GetLastModifiedTime(); pkgSourceList(); - pkgSourceList(string File); + pkgSourceList(std::string File); ~pkgSourceList(); }; diff --git a/apt-pkg/tagfile.h b/apt-pkg/tagfile.h index a5bf5ac90..fd24471c1 100644 --- a/apt-pkg/tagfile.h +++ b/apt-pkg/tagfile.h @@ -24,6 +24,10 @@ #include <string> +#ifndef APT_8_CLEANER_HEADERS +#include <apt-pkg/fileutl.h> +#endif + class FileFd; class pkgTagSection diff --git a/apt-pkg/vendorlist.h b/apt-pkg/vendorlist.h index 4e050477f..a86ccde7c 100644 --- a/apt-pkg/vendorlist.h +++ b/apt-pkg/vendorlist.h @@ -18,6 +18,8 @@ #include <apt-pkg/macros.h> #ifndef APT_8_CLEANER_HEADERS +#include <apt-pkg/vendor.h> +#include <apt-pkg/configuration.h> using std::string; using std::vector; #endif -- cgit v1.2.3-70-g09d2 From 73437844e2f22a17203dac0ba72317769ec54398 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Tue, 13 Dec 2011 01:43:28 +0100 Subject: note to myself: In case you rename something, make sure that you have renamed it everywhere as otherwise stuff "magically" starts to fail… MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes commit 2209 as the mixture of #define names generates a lovely compilable but non-functional mixture of gzip usage… --- apt-pkg/contrib/fileutl.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index 727d3ddb5..25ac5275c 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -1252,7 +1252,7 @@ bool FileFd::Seek(unsigned long long To) return result; } int res; -#ifdef USE_ZLIB +#ifdef APT_USE_ZLIB if (d->gz) res = gzseek(d->gz,To,SEEK_SET); else @@ -1273,7 +1273,7 @@ bool FileFd::Seek(unsigned long long To) bool FileFd::Skip(unsigned long long Over) { int res; -#ifdef USE_ZLIB +#ifdef APT_USE_ZLIB if (d->gz != NULL) res = gzseek(d->gz,Over,SEEK_CUR); else @@ -1313,7 +1313,7 @@ bool FileFd::Truncate(unsigned long long To) unsigned long long FileFd::Tell() { off_t Res; -#ifdef USE_ZLIB +#ifdef APT_USE_ZLIB if (d->gz != NULL) Res = gztell(d->gz); else @@ -1367,7 +1367,7 @@ unsigned long long FileFd::Size() } while(read != 0); Seek(0); } -#ifdef USE_ZLIB +#ifdef APT_USE_ZLIB // only check gzsize if we are actually a gzip file, just checking for // "gz" is not sufficient as uncompressed files could be opened with // gzopen in "direct" mode as well @@ -1439,7 +1439,7 @@ bool FileFd::Close() bool Res = true; if ((Flags & AutoClose) == AutoClose) { -#ifdef USE_ZLIB +#ifdef APT_USE_ZLIB if (d != NULL && d->gz != NULL) { int const e = gzclose(d->gz); // gzdopen() on empty files always fails with "buffer error" here, ignore that -- cgit v1.2.3-70-g09d2 From aee1aac6f75906ec73dacffc55e7026002201f98 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Tue, 13 Dec 2011 23:48:14 +0100 Subject: allow Open() and OpenDescriptor() to be called with a Compressor --- apt-pkg/contrib/fileutl.cc | 187 +++++++++++++++++++++++---------------------- apt-pkg/contrib/fileutl.h | 4 +- 2 files changed, 98 insertions(+), 93 deletions(-) diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index 25ac5275c..c2b684089 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -48,7 +48,7 @@ // so while the current implementation satisfies the testcases it is not a real option // to disable it for now #define APT_USE_ZLIB 1 -#ifdef APT_USE_ZLIB +#if APT_USE_ZLIB #include <zlib.h> #endif @@ -63,7 +63,7 @@ using namespace std; class FileFdPrivate { public: -#ifdef APT_USE_ZLIB +#if APT_USE_ZLIB gzFile gz; #else void* gz; @@ -914,95 +914,77 @@ bool FileFd::Open(string FileName,OpenMode Mode,CompressMode Compress, unsigned { if (Mode == ReadOnlyGzip) return Open(FileName, ReadOnly, Gzip, Perms); - Close(); - d = new FileFdPrivate; - d->openmode = Mode; - Flags = AutoClose; if (Compress == Auto && (Mode & WriteOnly) == WriteOnly) return _error->Error("Autodetection on %s only works in ReadOnly openmode!", FileName.c_str()); - if ((Mode & WriteOnly) != WriteOnly && (Mode & (Atomic | Create | Empty | Exclusive)) != 0) - return _error->Error("ReadOnly mode for %s doesn't accept additional flags!", FileName.c_str()); - - int fileflags = 0; -#define if_FLAGGED_SET(FLAG, MODE) if ((Mode & FLAG) == FLAG) fileflags |= MODE - if_FLAGGED_SET(ReadWrite, O_RDWR); - else if_FLAGGED_SET(ReadOnly, O_RDONLY); - else if_FLAGGED_SET(WriteOnly, O_WRONLY); - else return _error->Error("No openmode provided in FileFd::Open for %s", FileName.c_str()); - - if_FLAGGED_SET(Create, O_CREAT); - if_FLAGGED_SET(Exclusive, O_EXCL); - else if_FLAGGED_SET(Atomic, O_EXCL); - if_FLAGGED_SET(Empty, O_TRUNC); -#undef if_FLAGGED_SET // FIXME: Denote inbuilt compressors somehow - as we don't need to have the binaries for them std::vector<APT::Configuration::Compressor> const compressors = APT::Configuration::getCompressors(); std::vector<APT::Configuration::Compressor>::const_iterator compressor = compressors.begin(); if (Compress == Auto) { - Compress = None; for (; compressor != compressors.end(); ++compressor) { std::string file = std::string(FileName).append(compressor->Extension); if (FileExists(file) == false) continue; FileName = file; - if (compressor->Binary == ".") - Compress = None; - else - Compress = Extension; break; } } else if (Compress == Extension) { - Compress = None; std::string ext = flExtension(FileName); - if (ext != FileName) - { + if (ext == FileName) + ext.clear(); + else ext = "." + ext; - for (; compressor != compressors.end(); ++compressor) - if (ext == compressor->Extension) + for (; compressor != compressors.end(); ++compressor) + if (ext == compressor->Extension) + break; + // no matching extension - assume uncompressed (imagine files like 'example.org_Packages') + if (compressor == compressors.end()) + for (compressor = compressors.begin(); compressor != compressors.end(); ++compressor) + if (compressor->Name == ".") break; - } } - else if (Compress != None) + else { std::string name; switch (Compress) { + case None: name = "."; break; case Gzip: name = "gzip"; break; case Bzip2: name = "bzip2"; break; case Lzma: name = "lzma"; break; case Xz: name = "xz"; break; - default: return _error->Error("Can't find a match for specified compressor mode for file %s", FileName.c_str()); + case Auto: + case Extension: + // Unreachable + return _error->Error("Opening File %s in None, Auto or Extension should be already handled?!?", FileName.c_str()); } for (; compressor != compressors.end(); ++compressor) if (compressor->Name == name) break; - if (compressor == compressors.end() && name != "gzip") + if (compressor == compressors.end()) return _error->Error("Can't find a configured compressor %s for file %s", name.c_str(), FileName.c_str()); } - // if we have them, use inbuilt compressors instead of forking - if (compressor != compressors.end()) - { -#ifdef APT_USE_ZLIB - if (compressor->Name == "gzip") - { - Compress = Gzip; - compressor = compressors.end(); - } - else -#endif - if (compressor->Name == ".") - { - Compress = None; - compressor = compressors.end(); - } - } + if (compressor == compressors.end()) + return _error->Error("Can't find a match for specified compressor mode for file %s", FileName.c_str()); + return Open(FileName, Mode, *compressor, Perms); +} +bool FileFd::Open(string FileName,OpenMode Mode,APT::Configuration::Compressor const &compressor, unsigned long const Perms) +{ + Close(); + d = new FileFdPrivate; + d->openmode = Mode; + Flags = AutoClose; + + if ((Mode & WriteOnly) != WriteOnly && (Mode & (Atomic | Create | Empty | Exclusive)) != 0) + return _error->Error("ReadOnly mode for %s doesn't accept additional flags!", FileName.c_str()); + if ((Mode & ReadWrite) == 0) + return _error->Error("No openmode provided in FileFd::Open for %s", FileName.c_str()); if ((Mode & Atomic) == Atomic) { @@ -1023,18 +1005,35 @@ bool FileFd::Open(string FileName,OpenMode Mode,CompressMode Compress, unsigned unlink(FileName.c_str()); } - if (compressor != compressors.end()) + // if we have them, use inbuilt compressors instead of forking + if (compressor.Name != "." +#if APT_USE_ZLIB + && compressor.Name != "gzip" +#endif + ) { if ((Mode & ReadWrite) == ReadWrite) - return _error->Error("External compressors like %s do not support readwrite mode for file %s", compressor->Name.c_str(), FileName.c_str()); + return _error->Error("External compressors like %s do not support readwrite mode for file %s", compressor.Name.c_str(), FileName.c_str()); - if (ExecCompressor(*compressor, NULL /*d->compressor_pid*/, FileName, iFd, ((Mode & ReadOnly) != ReadOnly)) == false) - return _error->Error("Forking external compressor %s is not implemented for %s", compressor->Name.c_str(), FileName.c_str()); + if (ExecCompressor(compressor, NULL /*d->compressor_pid*/, FileName, iFd, ((Mode & ReadOnly) != ReadOnly)) == false) + return _error->Error("Forking external compressor %s is not implemented for %s", compressor.Name.c_str(), FileName.c_str()); d->pipe = true; - d->compressor = *compressor; + d->compressor = compressor; } else { + int fileflags = 0; + #define if_FLAGGED_SET(FLAG, MODE) if ((Mode & FLAG) == FLAG) fileflags |= MODE + if_FLAGGED_SET(ReadWrite, O_RDWR); + else if_FLAGGED_SET(ReadOnly, O_RDONLY); + else if_FLAGGED_SET(WriteOnly, O_WRONLY); + + if_FLAGGED_SET(Create, O_CREAT); + if_FLAGGED_SET(Exclusive, O_EXCL); + else if_FLAGGED_SET(Atomic, O_EXCL); + if_FLAGGED_SET(Empty, O_TRUNC); + #undef if_FLAGGED_SET + if (TemporaryFileName.empty() == false) iFd = open(TemporaryFileName.c_str(), fileflags, Perms); else @@ -1042,7 +1041,7 @@ bool FileFd::Open(string FileName,OpenMode Mode,CompressMode Compress, unsigned if (iFd != -1) { - if (OpenInternDescriptor(Mode, Compress) == false) + if (OpenInternDescriptor(Mode, compressor) == false) { close (iFd); iFd = -1; @@ -1062,13 +1061,37 @@ bool FileFd::Open(string FileName,OpenMode Mode,CompressMode Compress, unsigned // --------------------------------------------------------------------- /* */ bool FileFd::OpenDescriptor(int Fd, OpenMode Mode, CompressMode Compress, bool AutoClose) +{ + std::vector<APT::Configuration::Compressor> const compressors = APT::Configuration::getCompressors(); + std::vector<APT::Configuration::Compressor>::const_iterator compressor = compressors.begin(); + std::string name; + switch (Compress) + { + case None: name = "."; break; + case Gzip: name = "gzip"; break; + case Bzip2: name = "bzip2"; break; + case Lzma: name = "lzma"; break; + case Xz: name = "xz"; break; + case Auto: + case Extension: + return _error->Error("Opening Fd %d in Auto or Extension compression mode is not supported", Fd); + } + for (; compressor != compressors.end(); ++compressor) + if (compressor->Name == name) + break; + if (compressor == compressors.end()) + return _error->Error("Can't find a configured compressor %s for file %s", name.c_str(), FileName.c_str()); + + return OpenDescriptor(Fd, Mode, *compressor, AutoClose); +} +bool FileFd::OpenDescriptor(int Fd, OpenMode Mode, APT::Configuration::Compressor const &compressor, bool AutoClose) { Close(); d = new FileFdPrivate; d->openmode = Mode; Flags = (AutoClose) ? FileFd::AutoClose : 0; iFd = Fd; - if (OpenInternDescriptor(Mode, Compress) == false) + if (OpenInternDescriptor(Mode, compressor) == false) { if (AutoClose) close (iFd); @@ -1077,12 +1100,12 @@ bool FileFd::OpenDescriptor(int Fd, OpenMode Mode, CompressMode Compress, bool A this->FileName = ""; return true; } -bool FileFd::OpenInternDescriptor(OpenMode Mode, CompressMode Compress) +bool FileFd::OpenInternDescriptor(OpenMode Mode, APT::Configuration::Compressor const &compressor) { - if (Compress == None) + if (compressor.Name == ".") return true; -#ifdef APT_USE_ZLIB - else if (Compress == Gzip) +#if APT_USE_ZLIB + else if (compressor.Name == "gzip") { if ((Mode & ReadWrite) == ReadWrite) d->gz = gzdopen(iFd, "r+"); @@ -1096,27 +1119,7 @@ bool FileFd::OpenInternDescriptor(OpenMode Mode, CompressMode Compress) } #endif else - { - std::string name; - switch (Compress) - { - case Gzip: name = "gzip"; break; - case Bzip2: name = "bzip2"; break; - case Lzma: name = "lzma"; break; - case Xz: name = "xz"; break; - default: return _error->Error("Can't find a match for specified compressor mode for file %s", FileName.c_str()); - } - std::vector<APT::Configuration::Compressor> const compressors = APT::Configuration::getCompressors(); - std::vector<APT::Configuration::Compressor>::const_iterator compressor = compressors.begin(); - for (; compressor != compressors.end(); ++compressor) - if (compressor->Name == name) - break; - if (compressor == compressors.end() || - ExecCompressor(*compressor, NULL /*&(d->compressor_pid)*/, - FileName, iFd, ((Mode & ReadOnly) != ReadOnly)) == false) - return _error->Error("Forking external compressor %s is not implemented for %s", name.c_str(), FileName.c_str()); - d->pipe = true; - } + return _error->Error("Can't find a match for specified compressor %s for file %s", compressor.Name.c_str(), FileName.c_str()); return true; } /*}}}*/ @@ -1142,7 +1145,7 @@ bool FileFd::Read(void *To,unsigned long long Size,unsigned long long *Actual) *((char *)To) = '\0'; do { -#ifdef APT_USE_ZLIB +#if APT_USE_ZLIB if (d->gz != NULL) Res = gzread(d->gz,To,Size); else @@ -1184,7 +1187,7 @@ bool FileFd::Read(void *To,unsigned long long Size,unsigned long long *Actual) char* FileFd::ReadLine(char *To, unsigned long long const Size) { *To = '\0'; -#ifdef APT_USE_ZLIB +#if APT_USE_ZLIB if (d->gz != NULL) return gzgets(d->gz, To, Size); #endif @@ -1211,7 +1214,7 @@ bool FileFd::Write(const void *From,unsigned long long Size) errno = 0; do { -#ifdef APT_USE_ZLIB +#if APT_USE_ZLIB if (d->gz != NULL) Res = gzwrite(d->gz,From,Size); else @@ -1252,7 +1255,7 @@ bool FileFd::Seek(unsigned long long To) return result; } int res; -#ifdef APT_USE_ZLIB +#if APT_USE_ZLIB if (d->gz) res = gzseek(d->gz,To,SEEK_SET); else @@ -1273,7 +1276,7 @@ bool FileFd::Seek(unsigned long long To) bool FileFd::Skip(unsigned long long Over) { int res; -#ifdef APT_USE_ZLIB +#if APT_USE_ZLIB if (d->gz != NULL) res = gzseek(d->gz,Over,SEEK_CUR); else @@ -1313,7 +1316,7 @@ bool FileFd::Truncate(unsigned long long To) unsigned long long FileFd::Tell() { off_t Res; -#ifdef APT_USE_ZLIB +#if APT_USE_ZLIB if (d->gz != NULL) Res = gztell(d->gz); else @@ -1367,7 +1370,7 @@ unsigned long long FileFd::Size() } while(read != 0); Seek(0); } -#ifdef APT_USE_ZLIB +#if APT_USE_ZLIB // only check gzsize if we are actually a gzip file, just checking for // "gz" is not sufficient as uncompressed files could be opened with // gzopen in "direct" mode as well @@ -1439,7 +1442,7 @@ bool FileFd::Close() bool Res = true; if ((Flags & AutoClose) == AutoClose) { -#ifdef APT_USE_ZLIB +#if APT_USE_ZLIB if (d != NULL && d->gz != NULL) { int const e = gzclose(d->gz); // gzdopen() on empty files always fails with "buffer error" here, ignore that diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h index 8a986b82b..51277290e 100644 --- a/apt-pkg/contrib/fileutl.h +++ b/apt-pkg/contrib/fileutl.h @@ -101,10 +101,12 @@ class FileFd } bool Open(std::string FileName,OpenMode Mode,CompressMode Compress,unsigned long const Perms = 0666); + bool Open(std::string FileName,OpenMode Mode,APT::Configuration::Compressor const &compressor,unsigned long const Perms = 0666); inline bool Open(std::string const &FileName,OpenMode Mode, unsigned long const Perms = 0666) { return Open(FileName, Mode, None, Perms); }; bool OpenDescriptor(int Fd, OpenMode Mode, CompressMode Compress, bool AutoClose=false); + bool OpenDescriptor(int Fd, OpenMode Mode, APT::Configuration::Compressor const &compressor, bool AutoClose=false); inline bool OpenDescriptor(int Fd, OpenMode Mode, bool AutoClose=false) { return OpenDescriptor(Fd, Mode, None, AutoClose); }; @@ -145,7 +147,7 @@ class FileFd private: FileFdPrivate* d; - bool OpenInternDescriptor(OpenMode Mode, CompressMode Compress); + bool OpenInternDescriptor(OpenMode Mode, APT::Configuration::Compressor const &compressor); }; bool RunScripts(const char *Cnf); -- cgit v1.2.3-70-g09d2 From 52b47296f61ec3ca1075bbfb44982f5caa541e7c Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Wed, 14 Dec 2011 22:11:43 +0100 Subject: use FileFd instead of forking the compression childs by hand --- apt-pkg/contrib/fileutl.cc | 90 +++++++++++++++++++++++++++++++++++---------- apt-pkg/contrib/fileutl.h | 20 +++++----- ftparchive/multicompress.cc | 30 ++------------- ftparchive/multicompress.h | 1 - 4 files changed, 83 insertions(+), 58 deletions(-) diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index c2b684089..60396fc3d 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -50,6 +50,8 @@ #define APT_USE_ZLIB 1 #if APT_USE_ZLIB #include <zlib.h> +#else +#warning "Usage of zlib is DISABLED!" #endif #ifdef WORDS_BIGENDIAN @@ -71,7 +73,7 @@ class FileFdPrivate { pid_t compressor_pid; bool pipe; APT::Configuration::Compressor compressor; - FileFd::OpenMode openmode; + unsigned int openmode; FileFdPrivate() : gz(NULL), compressor_pid(-1), pipe(false) {}; }; @@ -858,8 +860,13 @@ bool ExecCompressor(APT::Configuration::Compressor const &Prog, for (int J = 0; J != 2; J++) SetCloseExec(Pipe[J],true); + int FileFd = -1; if (Comp == true) + { OutFd = Pipe[1]; + // FIXME: we should handle openmode and permission from Open() here + FileFd = open(FileName.c_str(), O_WRONLY, 0666); + } else OutFd = Pipe[0]; @@ -872,13 +879,14 @@ bool ExecCompressor(APT::Configuration::Compressor const &Prog, if (Comp == true) { dup2(Pipe[0],STDIN_FILENO); + dup2(FileFd,STDOUT_FILENO); SetCloseExec(STDIN_FILENO,false); } else { dup2(Pipe[1],STDOUT_FILENO); - SetCloseExec(STDOUT_FILENO,false); } + SetCloseExec(STDOUT_FILENO,false); std::vector<char const*> Args; Args.push_back(Prog.Binary.c_str()); @@ -887,8 +895,11 @@ bool ExecCompressor(APT::Configuration::Compressor const &Prog, for (std::vector<std::string>::const_iterator a = addArgs->begin(); a != addArgs->end(); ++a) Args.push_back(a->c_str()); - Args.push_back("--stdout"); - Args.push_back(FileName.c_str()); + if (Comp == false) + { + Args.push_back("--stdout"); + Args.push_back(FileName.c_str()); + } Args.push_back(NULL); execvp(Args[0],(char **)&Args[0]); @@ -896,7 +907,10 @@ bool ExecCompressor(APT::Configuration::Compressor const &Prog, _exit(100); } if (Comp == true) + { close(Pipe[0]); + close(FileFd); + } else close(Pipe[1]); @@ -910,7 +924,7 @@ bool ExecCompressor(APT::Configuration::Compressor const &Prog, // FileFd::Open - Open a file /*{{{*/ // --------------------------------------------------------------------- /* The most commonly used open mode combinations are given with Mode */ -bool FileFd::Open(string FileName,OpenMode Mode,CompressMode Compress, unsigned long const Perms) +bool FileFd::Open(string FileName,unsigned int const Mode,CompressMode Compress, unsigned long const Perms) { if (Mode == ReadOnlyGzip) return Open(FileName, ReadOnly, Gzip, Perms); @@ -934,11 +948,20 @@ bool FileFd::Open(string FileName,OpenMode Mode,CompressMode Compress, unsigned } else if (Compress == Extension) { - std::string ext = flExtension(FileName); - if (ext == FileName) - ext.clear(); - else - ext = "." + ext; + std::string::size_type const found = FileName.find_last_of('.'); + std::string ext; + if (found != std::string::npos) + { + ext = FileName.substr(found); + if (ext == ".new" || ext == ".bak") + { + std::string::size_type const found2 = FileName.find_last_of('.', found - 1); + if (found2 != std::string::npos) + ext = FileName.substr(found2, found - found2); + else + ext.clear(); + } + } for (; compressor != compressors.end(); ++compressor) if (ext == compressor->Extension) break; @@ -960,8 +983,8 @@ bool FileFd::Open(string FileName,OpenMode Mode,CompressMode Compress, unsigned case Xz: name = "xz"; break; case Auto: case Extension: - // Unreachable - return _error->Error("Opening File %s in None, Auto or Extension should be already handled?!?", FileName.c_str()); + // Unreachable + return _error->Error("Opening File %s in None, Auto or Extension should be already handled?!?", FileName.c_str()); } for (; compressor != compressors.end(); ++compressor) if (compressor->Name == name) @@ -974,7 +997,7 @@ bool FileFd::Open(string FileName,OpenMode Mode,CompressMode Compress, unsigned return _error->Error("Can't find a match for specified compressor mode for file %s", FileName.c_str()); return Open(FileName, Mode, *compressor, Perms); } -bool FileFd::Open(string FileName,OpenMode Mode,APT::Configuration::Compressor const &compressor, unsigned long const Perms) +bool FileFd::Open(string FileName,unsigned int const Mode,APT::Configuration::Compressor const &compressor, unsigned long const Perms) { Close(); d = new FileFdPrivate; @@ -1015,8 +1038,35 @@ bool FileFd::Open(string FileName,OpenMode Mode,APT::Configuration::Compressor c if ((Mode & ReadWrite) == ReadWrite) return _error->Error("External compressors like %s do not support readwrite mode for file %s", compressor.Name.c_str(), FileName.c_str()); - if (ExecCompressor(compressor, NULL /*d->compressor_pid*/, FileName, iFd, ((Mode & ReadOnly) != ReadOnly)) == false) - return _error->Error("Forking external compressor %s is not implemented for %s", compressor.Name.c_str(), FileName.c_str()); + if ((Mode & (WriteOnly | Create)) == (WriteOnly | Create)) + { + if (TemporaryFileName.empty() == false) + { + if (RealFileExists(TemporaryFileName) == false) + { + iFd = open(TemporaryFileName.c_str(), O_WRONLY | O_CREAT, Perms); + close(iFd); + iFd = -1; + } + } + else if (RealFileExists(FileName) == false) + { + iFd = open(FileName.c_str(), O_WRONLY | O_CREAT, Perms); + close(iFd); + iFd = -1; + } + } + + if (TemporaryFileName.empty() == false) + { + if (ExecCompressor(compressor, &(d->compressor_pid), TemporaryFileName, iFd, ((Mode & ReadOnly) != ReadOnly)) == false) + return _error->Error("Forking external compressor %s is not implemented for %s", compressor.Name.c_str(), TemporaryFileName.c_str()); + } + else + { + if (ExecCompressor(compressor, &(d->compressor_pid), FileName, iFd, ((Mode & ReadOnly) != ReadOnly)) == false) + return _error->Error("Forking external compressor %s is not implemented for %s", compressor.Name.c_str(), FileName.c_str()); + } d->pipe = true; d->compressor = compressor; } @@ -1060,7 +1110,7 @@ bool FileFd::Open(string FileName,OpenMode Mode,APT::Configuration::Compressor c // FileFd::OpenDescriptor - Open a filedescriptor /*{{{*/ // --------------------------------------------------------------------- /* */ -bool FileFd::OpenDescriptor(int Fd, OpenMode Mode, CompressMode Compress, bool AutoClose) +bool FileFd::OpenDescriptor(int Fd, unsigned int const Mode, CompressMode Compress, bool AutoClose) { std::vector<APT::Configuration::Compressor> const compressors = APT::Configuration::getCompressors(); std::vector<APT::Configuration::Compressor>::const_iterator compressor = compressors.begin(); @@ -1084,7 +1134,7 @@ bool FileFd::OpenDescriptor(int Fd, OpenMode Mode, CompressMode Compress, bool A return OpenDescriptor(Fd, Mode, *compressor, AutoClose); } -bool FileFd::OpenDescriptor(int Fd, OpenMode Mode, APT::Configuration::Compressor const &compressor, bool AutoClose) +bool FileFd::OpenDescriptor(int Fd, unsigned int const Mode, APT::Configuration::Compressor const &compressor, bool AutoClose) { Close(); d = new FileFdPrivate; @@ -1100,7 +1150,7 @@ bool FileFd::OpenDescriptor(int Fd, OpenMode Mode, APT::Configuration::Compresso this->FileName = ""; return true; } -bool FileFd::OpenInternDescriptor(OpenMode Mode, APT::Configuration::Compressor const &compressor) +bool FileFd::OpenInternDescriptor(unsigned int const Mode, APT::Configuration::Compressor const &compressor) { if (compressor.Name == ".") return true; @@ -1471,8 +1521,8 @@ bool FileFd::Close() if (d != NULL) { -// if (d->compressor_pid != -1) -// ExecWait(d->compressor_pid, "FileFdCompressor", true); + if (d->compressor_pid != -1) + ExecWait(d->compressor_pid, "FileFdCompressor", true); delete d; d = NULL; } diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h index 51277290e..f14f97b69 100644 --- a/apt-pkg/contrib/fileutl.h +++ b/apt-pkg/contrib/fileutl.h @@ -100,14 +100,14 @@ class FileFd return T; } - bool Open(std::string FileName,OpenMode Mode,CompressMode Compress,unsigned long const Perms = 0666); - bool Open(std::string FileName,OpenMode Mode,APT::Configuration::Compressor const &compressor,unsigned long const Perms = 0666); - inline bool Open(std::string const &FileName,OpenMode Mode, unsigned long const Perms = 0666) { + bool Open(std::string FileName,unsigned int const Mode,CompressMode Compress,unsigned long const Perms = 0666); + bool Open(std::string FileName,unsigned int const Mode,APT::Configuration::Compressor const &compressor,unsigned long const Perms = 0666); + inline bool Open(std::string const &FileName,unsigned int const Mode, unsigned long const Perms = 0666) { return Open(FileName, Mode, None, Perms); }; - bool OpenDescriptor(int Fd, OpenMode Mode, CompressMode Compress, bool AutoClose=false); - bool OpenDescriptor(int Fd, OpenMode Mode, APT::Configuration::Compressor const &compressor, bool AutoClose=false); - inline bool OpenDescriptor(int Fd, OpenMode Mode, bool AutoClose=false) { + bool OpenDescriptor(int Fd, unsigned int const Mode, CompressMode Compress, bool AutoClose=false); + bool OpenDescriptor(int Fd, unsigned int const Mode, APT::Configuration::Compressor const &compressor, bool AutoClose=false); + inline bool OpenDescriptor(int Fd, unsigned int const Mode, bool AutoClose=false) { return OpenDescriptor(Fd, Mode, None, AutoClose); }; bool Close(); @@ -126,16 +126,16 @@ class FileFd inline bool IsCompressed() {return (Flags & Compressed) == Compressed;}; inline std::string &Name() {return FileName;}; - FileFd(std::string FileName,OpenMode Mode,unsigned long Perms = 0666) : iFd(-1), Flags(0), d(NULL) + FileFd(std::string FileName,unsigned int const Mode,unsigned long Perms = 0666) : iFd(-1), Flags(0), d(NULL) { Open(FileName,Mode, None, Perms); }; - FileFd(std::string FileName,OpenMode Mode, CompressMode Compress, unsigned long Perms = 0666) : iFd(-1), Flags(0), d(NULL) + FileFd(std::string FileName,unsigned int const Mode, CompressMode Compress, unsigned long Perms = 0666) : iFd(-1), Flags(0), d(NULL) { Open(FileName,Mode, Compress, Perms); }; FileFd() : iFd(-1), Flags(AutoClose), d(NULL) {}; - FileFd(int const Fd, OpenMode Mode = ReadWrite, CompressMode Compress = None) : iFd(-1), Flags(0), d(NULL) + FileFd(int const Fd, unsigned int const Mode = ReadWrite, CompressMode Compress = None) : iFd(-1), Flags(0), d(NULL) { OpenDescriptor(Fd, Mode, Compress); }; @@ -147,7 +147,7 @@ class FileFd private: FileFdPrivate* d; - bool OpenInternDescriptor(OpenMode Mode, APT::Configuration::Compressor const &compressor); + bool OpenInternDescriptor(unsigned int const Mode, APT::Configuration::Compressor const &compressor); }; bool RunScripts(const char *Cnf); diff --git a/ftparchive/multicompress.cc b/ftparchive/multicompress.cc index 37a713efd..2a930ca6b 100644 --- a/ftparchive/multicompress.cc +++ b/ftparchive/multicompress.cc @@ -91,7 +91,7 @@ MultiCompress::MultiCompress(string const &Output,string const &Compress, /* Open all the temp files now so we can report any errors. File is made unreable to prevent people from touching it during creating. */ for (Files *I = Outputs; I != 0; I = I->Next) - I->TmpFile.Open(I->Output + ".new",FileFd::WriteEmpty,0600); + I->TmpFile.Open(I->Output + ".new", FileFd::WriteOnly | FileFd::Create | FileFd::Empty, FileFd::Extension, 0600); if (_error->PendingError() == true) return; @@ -183,11 +183,6 @@ bool MultiCompress::Start() _exit(0); }; - /* Tidy up the temp files, we open them in the constructor so as to - get proper error reporting. Close them now. */ - for (Files *I = Outputs; I != 0; I = I->Next) - I->TmpFile.Close(); - close(Pipe[0]); Input = fdopen(Pipe[1],"w"); if (Input == 0) @@ -305,14 +300,6 @@ bool MultiCompress::CloseOld(int Fd,pid_t Proc) is new then the temp files are renamed, otherwise they are erased. */ bool MultiCompress::Child(int const &FD) { - // Start the compression children. - for (Files *I = Outputs; I != 0; I = I->Next) - { - if (ExecCompressor(I->CompressProg,&(I->CompressProc),I->TmpFile.Fd(), - I->Fd,true) == false) - return false; - } - /* Okay, now we just feed data from FD to all the other FDs. Also stash a hash of the data to use later. */ SetNonBlock(FD,false); @@ -332,25 +319,14 @@ bool MultiCompress::Child(int const &FD) FileSize += Res; for (Files *I = Outputs; I != 0; I = I->Next) { - if (write(I->Fd,Buffer,Res) != Res) + if (I->TmpFile.Write(Buffer, Res) == false) { _error->Errno("write",_("IO to subprocess/file failed")); break; } } } - - // Close all the writers - for (Files *I = Outputs; I != 0; I = I->Next) - close(I->Fd); - - // Wait for the compressors to exit - for (Files *I = Outputs; I != 0; I = I->Next) - { - if (I->CompressProc != -1) - ExecWait(I->CompressProc, I->CompressProg.Binary.c_str(), false); - } - + if (_error->PendingError() == true) return false; diff --git a/ftparchive/multicompress.h b/ftparchive/multicompress.h index ac8bd0746..2dc7095d7 100644 --- a/ftparchive/multicompress.h +++ b/ftparchive/multicompress.h @@ -34,7 +34,6 @@ class MultiCompress FileFd TmpFile; pid_t CompressProc; time_t OldMTime; - int Fd; }; Files *Outputs; -- cgit v1.2.3-70-g09d2 From 12d1f5b3e295c589371bf7de27b7918310d08480 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Wed, 14 Dec 2011 22:35:03 +0100 Subject: remove the second usage instance of ExecCompressor in ftparchive by again using the FileFd directly --- ftparchive/multicompress.cc | 42 +++++++++--------------------------------- ftparchive/multicompress.h | 3 +-- ftparchive/writer.cc | 23 ++++++++--------------- 3 files changed, 18 insertions(+), 50 deletions(-) diff --git a/ftparchive/multicompress.cc b/ftparchive/multicompress.cc index 2a930ca6b..1fea589e2 100644 --- a/ftparchive/multicompress.cc +++ b/ftparchive/multicompress.cc @@ -260,7 +260,7 @@ bool MultiCompress::Finalize(unsigned long long &OutSize) // MultiCompress::OpenOld - Open an old file /*{{{*/ // --------------------------------------------------------------------- /* This opens one of the original output files, possibly decompressing it. */ -bool MultiCompress::OpenOld(int &Fd,pid_t &Proc) +bool MultiCompress::OpenOld(FileFd &Fd) { Files *Best = Outputs; for (Files *I = Outputs; I != 0; I = I->Next) @@ -268,29 +268,9 @@ bool MultiCompress::OpenOld(int &Fd,pid_t &Proc) Best = I; // Open the file - FileFd F(Best->Output,FileFd::ReadOnly); - if (_error->PendingError() == true) - return false; - - // Decompress the file so we can read it - if (ExecCompressor(Best->CompressProg,&Proc,F.Fd(),Fd,false) == false) - return false; - - return true; + return Fd.Open(Best->Output, FileFd::ReadOnly, FileFd::Extension); } /*}}}*/ -// MultiCompress::CloseOld - Close the old file /*{{{*/ -// --------------------------------------------------------------------- -/* */ -bool MultiCompress::CloseOld(int Fd,pid_t Proc) -{ - close(Fd); - if (Proc != -1) - if (ExecWait(Proc,_("decompressor"),false) == false) - return false; - return true; -} - /*}}}*/ // MultiCompress::Child - The writer child /*{{{*/ // --------------------------------------------------------------------- /* The child process forks a bunch of compression children and takes @@ -345,31 +325,27 @@ bool MultiCompress::Child(int const &FD) // Check the MD5 of the lowest cost entity. while (Missing == false) { - int CompFd = -1; - pid_t Proc = -1; - if (OpenOld(CompFd,Proc) == false) + FileFd CompFd; + if (OpenOld(CompFd) == false) { _error->Discard(); break; } - + // Compute the hash MD5Summation OldMD5; unsigned long long NewFileSize = 0; while (1) { - int Res = read(CompFd,Buffer,sizeof(Buffer)); + unsigned long long Res = 0; + if (CompFd.Read(Buffer,sizeof(Buffer), &Res) == false) + return _error->Errno("read",_("Failed to read while computing MD5")); if (Res == 0) break; - if (Res < 0) - return _error->Errno("read",_("Failed to read while computing MD5")); NewFileSize += Res; OldMD5.Add(Buffer,Res); } - - // Tidy the compressor - if (CloseOld(CompFd,Proc) == false) - return false; + CompFd.Close(); // Check the hash if (OldMD5.Result() == MD5.Result() && diff --git a/ftparchive/multicompress.h b/ftparchive/multicompress.h index 2dc7095d7..388fad22e 100644 --- a/ftparchive/multicompress.h +++ b/ftparchive/multicompress.h @@ -51,8 +51,7 @@ class MultiCompress unsigned long UpdateMTime; bool Finalize(unsigned long long &OutSize); - bool OpenOld(int &Fd,pid_t &Proc); - bool CloseOld(int Fd,pid_t Proc); + bool OpenOld(FileFd &Fd); static bool GetStat(std::string const &Output,std::string const &Compress,struct stat &St); MultiCompress(std::string const &Output,std::string const &Compress, diff --git a/ftparchive/writer.cc b/ftparchive/writer.cc index 27e53faf8..02777713c 100644 --- a/ftparchive/writer.cc +++ b/ftparchive/writer.cc @@ -889,22 +889,16 @@ bool ContentsWriter::ReadFromPkgs(string const &PkgFile,string const &PkgCompres MultiCompress Pkgs(PkgFile,PkgCompress,0,false); if (_error->PendingError() == true) return false; - + // Open the package file - int CompFd = -1; - pid_t Proc = -1; - if (Pkgs.OpenOld(CompFd,Proc) == false) + FileFd Fd; + if (Pkgs.OpenOld(Fd) == false) return false; - - // No auto-close FD - FileFd Fd(CompFd,false); + pkgTagFile Tags(&Fd); if (_error->PendingError() == true) - { - Pkgs.CloseOld(CompFd,Proc); return false; - } - + // Parse. pkgTagSection Section; while (Tags.Step(Section) == true) @@ -926,11 +920,10 @@ bool ContentsWriter::ReadFromPkgs(string const &PkgFile,string const &PkgCompres _error->DumpErrors(); } } - + // Tidy the compressor - if (Pkgs.CloseOld(CompFd,Proc) == false) - return false; - + Fd.Close(); + return true; } -- cgit v1.2.3-70-g09d2 From 73688d27f60b2da3889a06362ee567101e3b331e Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Thu, 15 Dec 2011 09:13:21 +0100 Subject: atleast libapt should announce to itself that it is clean… (and be it if it tries to announce that…) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apt-pkg/deb/debindexfile.cc | 2 ++ apt-pkg/edsp/edspindexfile.cc | 4 ++-- apt-pkg/pkgcachegen.cc | 16 +++++++++------- apt-pkg/sourcelist.h | 4 ++-- apt-pkg/srcrecords.cc | 8 ++++---- buildlib/config.h.in | 2 ++ cmdline/apt-extracttemplates.h | 10 ++++++---- 7 files changed, 27 insertions(+), 19 deletions(-) diff --git a/apt-pkg/deb/debindexfile.cc b/apt-pkg/deb/debindexfile.cc index 2635d52c8..84791a70a 100644 --- a/apt-pkg/deb/debindexfile.cc +++ b/apt-pkg/deb/debindexfile.cc @@ -26,6 +26,8 @@ #include <sys/stat.h> /*}}}*/ +using std::string; + // SourcesIndex::debSourcesIndex - Constructor /*{{{*/ // --------------------------------------------------------------------- /* */ diff --git a/apt-pkg/edsp/edspindexfile.cc b/apt-pkg/edsp/edspindexfile.cc index 5d824f9cb..482581979 100644 --- a/apt-pkg/edsp/edspindexfile.cc +++ b/apt-pkg/edsp/edspindexfile.cc @@ -24,7 +24,7 @@ // edspIndex::edspIndex - Constructor /*{{{*/ // --------------------------------------------------------------------- /* */ -edspIndex::edspIndex(string File) : debStatusIndex(File) +edspIndex::edspIndex(std::string File) : debStatusIndex(File) { } /*}}}*/ @@ -44,7 +44,7 @@ bool edspIndex::Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const if (Prog != NULL) Prog->SubProgress(0,File); - if (Gen.SelectFile(File,string(),*this) == false) + if (Gen.SelectFile(File,std::string(),*this) == false) return _error->Error("Problem with SelectFile %s",File.c_str()); // Store the IMS information diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index 9f999c41b..ec072fddd 100644 --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@ -35,12 +35,14 @@ #include <apti18n.h> /*}}}*/ -typedef vector<pkgIndexFile *>::iterator FileIterator; +typedef std::vector<pkgIndexFile *>::iterator FileIterator; template <typename Iter> std::vector<Iter*> pkgCacheGenerator::Dynamic<Iter>::toReMap; bool IsDuplicateDescription(pkgCache::DescIterator Desc, MD5SumValue const &CurMd5, std::string const &CurLang); +using std::string; + // CacheGenerator::pkgCacheGenerator - Constructor /*{{{*/ // --------------------------------------------------------------------- /* We set the dirty flag and make sure that is written to the disk */ @@ -1221,14 +1223,14 @@ bool pkgCacheGenerator::MakeStatusCache(pkgSourceList &List,OpProgress *Progress MMap **OutMap,bool AllowMem) { bool const Debug = _config->FindB("Debug::pkgCacheGen", false); - - vector<pkgIndexFile *> Files; - for (vector<metaIndex *>::const_iterator i = List.begin(); + + std::vector<pkgIndexFile *> Files; + for (std::vector<metaIndex *>::const_iterator i = List.begin(); i != List.end(); ++i) { - vector <pkgIndexFile *> *Indexes = (*i)->GetIndexFiles(); - for (vector<pkgIndexFile *>::const_iterator j = Indexes->begin(); + std::vector <pkgIndexFile *> *Indexes = (*i)->GetIndexFiles(); + for (std::vector<pkgIndexFile *>::const_iterator j = Indexes->begin(); j != Indexes->end(); ++j) Files.push_back (*j); @@ -1418,7 +1420,7 @@ __deprecated bool pkgMakeOnlyStatusCache(OpProgress &Progress,DynamicMMap **OutM { return pkgCacheGenerator::MakeOnlyStatusCache(&Progress, OutMap); } bool pkgCacheGenerator::MakeOnlyStatusCache(OpProgress *Progress,DynamicMMap **OutMap) { - vector<pkgIndexFile *> Files; + std::vector<pkgIndexFile *> Files; unsigned long EndOfSource = Files.size(); if (_system->AddStatusFiles(Files) == false) return false; diff --git a/apt-pkg/sourcelist.h b/apt-pkg/sourcelist.h index 03e29ec34..02e27101a 100644 --- a/apt-pkg/sourcelist.h +++ b/apt-pkg/sourcelist.h @@ -59,11 +59,11 @@ class pkgSourceList const char *Name; const char *Label; - bool FixupURI(string &URI) const; + bool FixupURI(std::string &URI) const; virtual bool ParseLine(std::vector<metaIndex *> &List, const char *Buffer, unsigned long const &CurLine,std::string const &File) const; - virtual bool CreateItem(vector<metaIndex *> &List,std::string const &URI, + virtual bool CreateItem(std::vector<metaIndex *> &List,std::string const &URI, std::string const &Dist,std::string const &Section, std::map<std::string, std::string> const &Options) const = 0; Type(); diff --git a/apt-pkg/srcrecords.cc b/apt-pkg/srcrecords.cc index f6d2d5158..48b643eac 100644 --- a/apt-pkg/srcrecords.cc +++ b/apt-pkg/srcrecords.cc @@ -29,8 +29,8 @@ pkgSrcRecords::pkgSrcRecords(pkgSourceList &List) : Files(0), Current(0) { for (pkgSourceList::const_iterator I = List.begin(); I != List.end(); ++I) { - vector<pkgIndexFile *> *Indexes = (*I)->GetIndexFiles(); - for (vector<pkgIndexFile *>::const_iterator J = Indexes->begin(); + std::vector<pkgIndexFile *> *Indexes = (*I)->GetIndexFiles(); + for (std::vector<pkgIndexFile *>::const_iterator J = Indexes->begin(); J != Indexes->end(); ++J) { Parser* P = (*J)->CreateSrcParser(); @@ -58,7 +58,7 @@ pkgSrcRecords::pkgSrcRecords(pkgSourceList &List) : Files(0), Current(0) pkgSrcRecords::~pkgSrcRecords() { // Blow away all the parser objects - for(vector<Parser*>::iterator I = Files.begin(); I != Files.end(); ++I) + for(std::vector<Parser*>::iterator I = Files.begin(); I != Files.end(); ++I) delete *I; } /*}}}*/ @@ -68,7 +68,7 @@ pkgSrcRecords::~pkgSrcRecords() bool pkgSrcRecords::Restart() { Current = Files.begin(); - for (vector<Parser*>::iterator I = Files.begin(); + for (std::vector<Parser*>::iterator I = Files.begin(); I != Files.end(); ++I) (*I)->Restart(); diff --git a/buildlib/config.h.in b/buildlib/config.h.in index 256911231..4798fe3f5 100644 --- a/buildlib/config.h.in +++ b/buildlib/config.h.in @@ -44,3 +44,5 @@ /* The package name string */ #undef PACKAGE + +#define APT_8_CLEANER_HEADERS diff --git a/cmdline/apt-extracttemplates.h b/cmdline/apt-extracttemplates.h index d0f90d3f4..6d07a09c2 100644 --- a/cmdline/apt-extracttemplates.h +++ b/cmdline/apt-extracttemplates.h @@ -14,6 +14,8 @@ #include <apt-pkg/pkgcache.h> #include <apt-pkg/dirstream.h> +#include <string> + class DebFile : public pkgDirStream { FileFd File; @@ -31,11 +33,11 @@ public: bool Go(); bool ParseInfo(); - static string GetInstalledVer(const string &package); + static std::string GetInstalledVer(const std::string &package); - string Package; - string Version; - string DepVer, PreDepVer; + std::string Package; + std::string Version; + std::string DepVer, PreDepVer; unsigned int DepOp, PreDepOp; char *Config; -- cgit v1.2.3-70-g09d2 From 17e4eb255750033b9fc6c64ad028c19f98ad08ad Mon Sep 17 00:00:00 2001 From: "bubulle@debian.org" <> Date: Thu, 15 Dec 2011 20:34:20 +0100 Subject: Dutch (Jeroen Schot). Closes: #652230 --- debian/changelog | 3 + po/nl.po | 878 +++++++++++++++++++++++++++++++------------------------ 2 files changed, 502 insertions(+), 379 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1dffe9c25..4fb8b89bc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,9 @@ apt (0.8.15.10) UNRELEASEDunstable; urgency=low * doc/*.xml: - find and fix a bunch of misspellings + [ Program translation updatex ] + * Dutch (Jeroen Schot). Closes: #652230 + -- David Kalnischkies <kalnischkies@gmail.com> Sun, 20 Nov 2011 18:02:08 +0100 apt (0.8.15.9) unstable; urgency=low diff --git a/po/nl.po b/po/nl.po index c6b254c5d..e3bb07d08 100644 --- a/po/nl.po +++ b/po/nl.po @@ -1,24 +1,25 @@ -# translation of nl.po to Dutch -# advanced package transfer - apt message translation catalog -# -# guus sliepen <guus@sliepen.warande.net>, 2002. -# jochem berends <j@jochem.net>, 2002. -# wannes soenen <wannes@wannes.cjb.net>, 2002. +# Dutch translation of apt. +# Copyright (C) 2002-2011 THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the apt package. +# Guus Sliepen <guus@sliepen.warande.net>, 2002. +# Jochem Berends <j@jochem.net>, 2002. +# Wannes Soenen <wannes@wannes.cjb.net>, 2002. # Frans Pop <elendil@planet.nl>, 2010. +# Jeroen Schot <schot@a-eskwadraat.nl>, 2011. +# msgid "" msgstr "" -"Project-Id-Version: nl\n" +"Project-Id-Version: apt 0.8.15.9\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-07-26 12:05+0200\n" -"PO-Revision-Date: 2010-03-16 06:52+0100\n" -"Last-Translator: Frans Pop <elendil@planet.nl>\n" -"Language-Team: Dutch <debian-l10n-dutch@lists.debian.org>\n" +"POT-Creation-Date: 2011-10-14 12:59+0200\n" +"PO-Revision-Date: 2011-12-05 17:10+0100\n" +"Last-Translator: Jeroen Schot <schot@a-eskwadraat.nl>\n" +"Language-Team: Debian l10n Dutch <debian-l10n-dutch@lists.debian.org>\n" "Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Poedit-Language: Dutch\n" -"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" #: cmdline/apt-cache.cc:154 #, c-format @@ -30,9 +31,8 @@ msgid "Total package names: " msgstr "Totaal aantal pakketnamen: " #: cmdline/apt-cache.cc:284 -#, fuzzy msgid "Total package structures: " -msgstr "Totaal aantal pakketnamen: " +msgstr "Totaal aantal pakketstructuren: " #: cmdline/apt-cache.cc:324 msgid " Normal packages: " @@ -106,9 +106,8 @@ msgid "No packages found" msgstr "Geen pakketten gevonden" #: cmdline/apt-cache.cc:1218 -#, fuzzy msgid "You must give at least one search pattern" -msgstr "U dient precies één patroon op te geven" +msgstr "U dient precies één zoekpatroon op te geven" #: cmdline/apt-cache.cc:1353 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." @@ -159,13 +158,50 @@ msgstr " Versietabel:" #: cmdline/apt-cache.cc:1675 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:73 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:589 -#: cmdline/apt-get.cc:3220 cmdline/apt-mark.cc:264 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:3235 cmdline/apt-mark.cc:264 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s voor %s gecompileerd op %s %s\n" #: cmdline/apt-cache.cc:1682 #, fuzzy +#| msgid "" +#| "Usage: apt-cache [options] command\n" +#| " apt-cache [options] add file1 [file2 ...]\n" +#| " apt-cache [options] showpkg pkg1 [pkg2 ...]\n" +#| " apt-cache [options] showsrc pkg1 [pkg2 ...]\n" +#| "\n" +#| "apt-cache is a low-level tool used to manipulate APT's binary\n" +#| "cache files, and query information from them\n" +#| "\n" +#| "Commands:\n" +#| " add - Add a package file to the source cache\n" +#| " gencaches - Build both the package and source cache\n" +#| " showpkg - Show some general information for a single package\n" +#| " showsrc - Show source records\n" +#| " stats - Show some basic statistics\n" +#| " dump - Show the entire file in a terse form\n" +#| " dumpavail - Print an available file to stdout\n" +#| " unmet - Show unmet dependencies\n" +#| " search - Search the package list for a regex pattern\n" +#| " show - Show a readable record for the package\n" +#| " showauto - Display a list of automatically installed packages\n" +#| " depends - Show raw dependency information for a package\n" +#| " rdepends - Show reverse dependency information for a package\n" +#| " pkgnames - List the names of all packages in the system\n" +#| " dotty - Generate package graphs for GraphViz\n" +#| " xvcg - Generate package graphs for xvcg\n" +#| " policy - Show policy settings\n" +#| "\n" +#| "Options:\n" +#| " -h This help text.\n" +#| " -p=? The package cache.\n" +#| " -s=? The source cache.\n" +#| " -q Disable progress indicator.\n" +#| " -i Show only important deps for the unmet command.\n" +#| " -c=? Read this configuration file\n" +#| " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#| "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n" msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] showpkg pkg1 [pkg2 ...]\n" @@ -210,32 +246,33 @@ msgstr "" "van APT kunt manipuleren en informatie daaruit kunt opvragen.\n" "\n" "Opdrachten:\n" -" add - Voeg een pakketbestand toe aan de broncache\n" -" gencaches - Bouw zowel de pakket- als de broncache\n" -" showpkg - Toon algemene informatie over een enkel pakket\n" -" showsrc - Toon bronrecords\n" -" stats - Toon enkele basisstatistieken\n" -" dump - Toon het gehele bestand in een compacte vorm\n" -" dumpavail - Print een beschikbaarheidsbestand op stdout\n" -" unmet - Toon niet voldane vereisten\n" -" search - Toon lijst met pakketten die met regexpatroon overeenkomen\n" -" show - Toon een leesbaar overzicht voor het pakket\n" -" depends - Toon de afhankelijkheden van een pakket\n" -" rdepends - Toon de pakketten die afhankelijk zijn van een pakket\n" -" pkgnames - Toon de namen van alle pakketten op het systeem\n" -" dotty - Genereer pakketgrafen voor GraphViz\n" -" xvcg - Genereer pakketgrafen voor xvcg\n" -" policy - Toon beleidsinstellingen\n" +" add - Voeg een pakketbestand toe aan de broncache.\n" +" gencaches - Bouw zowel de pakket- als de broncache.\n" +" showpkg - Toon algemene informatie over een enkel pakket.\n" +" showsrc - Toon bronrecords.\n" +" stats - Toon enkele basisstatistieken.\n" +" dump - Toon het gehele bestand in een compacte vorm.\n" +" dumpavail - Print een beschikbaarheidsbestand op de standaarduitvoer.\n" +" unmet - Toon niet-voldane vereisten.\n" +" search - Toon lijst met pakketten die met regexpatroon overeenkomen.\n" +" show - Toon een leesbaar overzicht voor het pakket.\n" +" showauto - Toon een lijst van automatisch geïnstalleerde pakketten.\n" +" depends - Toon de afhankelijkheden van een pakket.\n" +" rdepends - Toon de pakketten die afhankelijk zijn van een pakket.\n" +" pkgnames - Toon de namen van alle pakketten op het systeem.\n" +" dotty - Genereer pakketgrafen voor GraphViz.\n" +" xvcg - Genereer pakketgrafen voor xvcg.\n" +" policy - Toon beleidsinstellingen.\n" "\n" "Opties:\n" -" -h Deze hulptekst\n" -" -p=? De pakketcache\n" -" -s=? De broncache\n" -" -q Voortgangsindicator uitschakelen\n" -" -i Toon alleen belangrijke vereisten voor de 'unmet' opdracht\n" -" -c=? Lees dit configuratiebestand\n" -" -o=? Stel een willekeurige optie in, b.v. -o dir::cache=/tmp\n" -"Zie de apt-cache(8) en apt.conf(5) handleidingen voor meer informatie.\n" +" -h Deze hulptekst.\n" +" -p=? De pakketcache.\n" +" -s=? De broncache.\n" +" -q Voortgangsindicator uitschakelen.\n" +" -i Toon alleen belangrijke vereisten voor de 'unmet'-opdracht.\n" +" -c=? Lees dit configuratiebestand.\n" +" -o=? Stel een willekeurige optie in, b.v. -o dir::cache=/tmp.\n" +"Zie de man-pagina's van apt-cache(8) en apt.conf(5) voor meer informatie.\n" #: cmdline/apt-cdrom.cc:77 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" @@ -248,9 +285,9 @@ msgid "Please insert a Disc in the drive and press enter" msgstr "Gelieve een schijf in het station te plaatsen en op 'enter' te drukken" #: cmdline/apt-cdrom.cc:127 -#, fuzzy, c-format +#, c-format msgid "Failed to mount '%s' to '%s'" -msgstr "Hernoemen van %s naar %s is mislukt" +msgstr "Aankoppelen van '%s' op '%s' is mislukt" #: cmdline/apt-cdrom.cc:162 msgid "Repeat this process for the rest of the CDs in your set." @@ -319,7 +356,7 @@ msgstr "" " -c=? Lees dit configuratiebestand.\n" " -o=? Stel een willekeurige optie in, b.v. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1149 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1164 #, c-format msgid "Unable to write to %s" msgstr "Kan niet naar %s schrijven" @@ -478,7 +515,7 @@ msgstr "stat op %s is mislukt" msgid "Archive has no control record" msgstr "Archief heeft geen 'control'-record" -#: ftparchive/cachedb.cc:448 +#: ftparchive/cachedb.cc:452 msgid "Unable to get a cursor" msgstr "Kan geen cursor verkrijgen" @@ -763,14 +800,14 @@ msgid "%lu not fully installed or removed.\n" msgstr "%lu pakketten niet volledig geïnstalleerd of verwijderd.\n" #: cmdline/apt-get.cc:628 -#, fuzzy, c-format +#, c-format msgid "Note, selecting '%s' for task '%s'\n" -msgstr "Let op, %s wordt geselecteerd omwille van de regex '%s'\n" +msgstr "Let op, '%s' wordt geselecteerd omwille van de taak '%s'\n" #: cmdline/apt-get.cc:634 -#, fuzzy, c-format +#, c-format msgid "Note, selecting '%s' for regex '%s'\n" -msgstr "Let op, %s wordt geselecteerd omwille van de regex '%s'\n" +msgstr "Let op, '%s' wordt geselecteerd omwille van de regex '%s'\n" #: cmdline/apt-get.cc:651 #, c-format @@ -782,9 +819,8 @@ msgid " [Installed]" msgstr " [Geïnstalleerd]" #: cmdline/apt-get.cc:671 -#, fuzzy msgid " [Not candidate version]" -msgstr "Kandidaat-versies" +msgstr "[Niet de kandidaat-versie]" #: cmdline/apt-get.cc:673 msgid "You should explicitly select one to install." @@ -806,19 +842,19 @@ msgid "However the following packages replace it:" msgstr "Echter, de volgende pakketten vervangen dit:" #: cmdline/apt-get.cc:706 -#, fuzzy, c-format +#, c-format msgid "Package '%s' has no installation candidate" -msgstr "Pakket %s heeft geen installeerbare kandidaat" +msgstr "Pakket '%s' heeft geen kandidaat voor installatie" #: cmdline/apt-get.cc:717 #, c-format msgid "Virtual packages like '%s' can't be removed\n" -msgstr "" +msgstr "Virtuele pakketten zoals '%s' kunnen niet worden verwijderd\n" #: cmdline/apt-get.cc:748 -#, fuzzy, c-format +#, c-format msgid "Note, selecting '%s' instead of '%s'\n" -msgstr "Let op, %s wordt geselecteerd in plaats van %s\n" +msgstr "Let op, '%s' wordt geselecteerd in plaats van '%s'\n" #: cmdline/apt-get.cc:778 #, c-format @@ -828,10 +864,10 @@ msgstr "" "gevraagd.\n" #: cmdline/apt-get.cc:782 -#, fuzzy, c-format +#, c-format msgid "Skipping %s, it is not installed and only upgrades are requested.\n" msgstr "" -"%s wordt overgeslagen, het is al geïnstalleerd en opwaardering is niet " +"%s wordt overgeslagen, het is niet geïnstalleerd en alleen opwaardering is " "gevraagd.\n" #: cmdline/apt-get.cc:794 @@ -845,88 +881,89 @@ msgstr "" msgid "%s is already the newest version.\n" msgstr "%s is reeds de nieuwste versie.\n" -#: cmdline/apt-get.cc:818 cmdline/apt-get.cc:2088 cmdline/apt-mark.cc:59 +#: cmdline/apt-get.cc:818 cmdline/apt-get.cc:2096 cmdline/apt-mark.cc:59 #, c-format msgid "%s set to manually installed.\n" msgstr "%s is ingesteld voor handmatige installatie.\n" #: cmdline/apt-get.cc:844 -#, fuzzy, c-format +#, c-format msgid "Selected version '%s' (%s) for '%s'\n" -msgstr "Versie %s (%s) geselecteerd voor %s\n" +msgstr "Versie '%s' (%s) geselecteerd voor '%s'\n" #: cmdline/apt-get.cc:849 #, fuzzy, c-format +#| msgid "Selected version '%s' (%s) for '%s'\n" msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" -msgstr "Versie %s (%s) geselecteerd voor %s\n" +msgstr "Versie '%s' (%s) geselecteerd voor '%s'\n" -#: cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:891 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Pakket %s is niet geïnstalleerd, en wordt dus niet verwijderd\n" -#: cmdline/apt-get.cc:971 +#: cmdline/apt-get.cc:969 msgid "Correcting dependencies..." msgstr "Vereisten worden gecorrigeerd..." -#: cmdline/apt-get.cc:974 +#: cmdline/apt-get.cc:972 msgid " failed." msgstr " mislukt." -#: cmdline/apt-get.cc:977 +#: cmdline/apt-get.cc:975 msgid "Unable to correct dependencies" msgstr "Kan vereisten niet corrigeren" -#: cmdline/apt-get.cc:980 +#: cmdline/apt-get.cc:978 msgid "Unable to minimize the upgrade set" msgstr "Kon de verzameling op te waarderen pakketten niet minimaliseren" -#: cmdline/apt-get.cc:982 +#: cmdline/apt-get.cc:980 msgid " Done" msgstr " Klaar" -#: cmdline/apt-get.cc:986 +#: cmdline/apt-get.cc:984 msgid "You might want to run 'apt-get -f install' to correct these." msgstr "U kunt 'apt-get -f install' uitvoeren om dit op te lossen." -#: cmdline/apt-get.cc:989 +#: cmdline/apt-get.cc:987 msgid "Unmet dependencies. Try using -f." msgstr "Er zijn vereisten waaraan niet voldaan is. Probeer -f te gebruiken." -#: cmdline/apt-get.cc:1014 +#: cmdline/apt-get.cc:1012 msgid "WARNING: The following packages cannot be authenticated!" msgstr "" "WAARSCHUWING: De volgende pakketten kunnen niet geauthentificeerd worden:" -#: cmdline/apt-get.cc:1018 +#: cmdline/apt-get.cc:1016 msgid "Authentication warning overridden.\n" msgstr "Authentificatiewaarschuwing is genegeerd.\n" -#: cmdline/apt-get.cc:1025 +#: cmdline/apt-get.cc:1023 msgid "Install these packages without verification [y/N]? " msgstr "Wilt u deze pakketten installeren zonder verificatie [j/N]? " -#: cmdline/apt-get.cc:1027 +#: cmdline/apt-get.cc:1025 msgid "Some packages could not be authenticated" msgstr "Sommige pakketten konden niet geauthentificeerd worden" -#: cmdline/apt-get.cc:1036 cmdline/apt-get.cc:1197 +#: cmdline/apt-get.cc:1034 cmdline/apt-get.cc:1195 msgid "There are problems and -y was used without --force-yes" msgstr "Er zijn problemen en -y was gebruikt zonder --force-yes" -#: cmdline/apt-get.cc:1077 +#: cmdline/apt-get.cc:1075 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Interne fout, InstallPackages is aangeroepen met defecte pakketten!" -#: cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1084 msgid "Packages need to be removed but remove is disabled." msgstr "Pakketten moeten verwijderd worden maar verwijderen is uitgeschakeld." -#: cmdline/apt-get.cc:1097 +#: cmdline/apt-get.cc:1095 msgid "Internal error, Ordering didn't finish" msgstr "Interne fout, rangschikken is niet voltooid" -#: cmdline/apt-get.cc:1135 +#: cmdline/apt-get.cc:1133 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "Merkwaardig... De groottes kwamen niet overeen, gelieve apt@packages.debian." @@ -934,52 +971,52 @@ msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1142 +#: cmdline/apt-get.cc:1140 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Er moeten %sB/%sB aan archieven opgehaald worden.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1147 +#: cmdline/apt-get.cc:1145 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Er moeten %sB aan archieven opgehaald worden.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1154 +#: cmdline/apt-get.cc:1152 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "Door deze operatie zal er %sB extra schijfruimte gebruikt worden.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1159 +#: cmdline/apt-get.cc:1157 #, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "Door deze operatie zal er %sB schijfruimte vrijkomen.\n" -#: cmdline/apt-get.cc:1174 cmdline/apt-get.cc:1177 cmdline/apt-get.cc:2499 -#: cmdline/apt-get.cc:2502 +#: cmdline/apt-get.cc:1172 cmdline/apt-get.cc:1175 cmdline/apt-get.cc:2514 +#: cmdline/apt-get.cc:2517 #, c-format msgid "Couldn't determine free space in %s" msgstr "Kon de hoeveelheid vrije schijfruimte op %s niet bepalen" -#: cmdline/apt-get.cc:1187 +#: cmdline/apt-get.cc:1185 #, c-format msgid "You don't have enough free space in %s." msgstr "U heeft onvoldoende vrije schijfruimte op %s." -#: cmdline/apt-get.cc:1203 cmdline/apt-get.cc:1223 +#: cmdline/apt-get.cc:1201 cmdline/apt-get.cc:1221 msgid "Trivial Only specified but this is not a trivial operation." msgstr "'Trivial Only' is opgegeven, dit is echter geen triviale bewerking." -#: cmdline/apt-get.cc:1205 +#: cmdline/apt-get.cc:1203 msgid "Yes, do as I say!" msgstr "Ja, doe wat ik zeg!" -#: cmdline/apt-get.cc:1207 +#: cmdline/apt-get.cc:1205 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -990,28 +1027,28 @@ msgstr "" "Als u wilt doorgaan, dient u de zin '%s' in te typen.\n" " ?] " -#: cmdline/apt-get.cc:1213 cmdline/apt-get.cc:1232 +#: cmdline/apt-get.cc:1211 cmdline/apt-get.cc:1230 msgid "Abort." msgstr "Afbreken." -#: cmdline/apt-get.cc:1228 +#: cmdline/apt-get.cc:1226 msgid "Do you want to continue [Y/n]? " msgstr "Wilt u doorgaan [J/n]? " -#: cmdline/apt-get.cc:1300 cmdline/apt-get.cc:2564 apt-pkg/algorithms.cc:1438 +#: cmdline/apt-get.cc:1298 cmdline/apt-get.cc:2579 apt-pkg/algorithms.cc:1445 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Ophalen van %s is mislukt %s\n" -#: cmdline/apt-get.cc:1318 +#: cmdline/apt-get.cc:1316 msgid "Some files failed to download" msgstr "Ophalen van sommige bestanden is mislukt" -#: cmdline/apt-get.cc:1319 cmdline/apt-get.cc:2576 +#: cmdline/apt-get.cc:1317 cmdline/apt-get.cc:2591 msgid "Download complete and in download only mode" msgstr "Ophalen klaar en alleen-ophalen-modus staat aan" -#: cmdline/apt-get.cc:1325 +#: cmdline/apt-get.cc:1323 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -1019,19 +1056,19 @@ msgstr "" "Kon sommige archieven niet ophalen, misschien kunt u 'apt-get update' of --" "fix-missing proberen?" -#: cmdline/apt-get.cc:1329 +#: cmdline/apt-get.cc:1327 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing en medium wisselen wordt op dit moment niet ondersteund" -#: cmdline/apt-get.cc:1334 +#: cmdline/apt-get.cc:1332 msgid "Unable to correct missing packages." msgstr "Geen oplossing voor de missende pakketten gevonden." -#: cmdline/apt-get.cc:1335 +#: cmdline/apt-get.cc:1333 msgid "Aborting install." msgstr "Installatie wordt afgebroken." -#: cmdline/apt-get.cc:1363 +#: cmdline/apt-get.cc:1361 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -1039,37 +1076,41 @@ msgid_plural "" "The following packages disappeared from your system as\n" "all files have been overwritten by other packages:" msgstr[0] "" +"Het volgende pakket is van uw systeem verdwenen omdat\n" +"alle bestanden zijn overschreven door andere pakketten:" msgstr[1] "" +"De volgende pakketten zijn van uw systeem verdwenen omdat\n" +"alle bestanden zijn overschreven door andere pakketten:" -#: cmdline/apt-get.cc:1367 +#: cmdline/apt-get.cc:1365 msgid "Note: This is done automatic and on purpose by dpkg." -msgstr "" +msgstr "Let op: Dit wordt automatische en bewust door dpkg gedaan." -#: cmdline/apt-get.cc:1505 +#: cmdline/apt-get.cc:1503 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "Negeer niet beschikbare doelrelease '%s' van pakket '%s'" -#: cmdline/apt-get.cc:1537 +#: cmdline/apt-get.cc:1535 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "'%s' wordt genomen als bronpakket in plaats van '%s'\n" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1575 +#: cmdline/apt-get.cc:1573 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "Negeer niet beschikbare versie '%s' van pakket '%s'" -#: cmdline/apt-get.cc:1591 +#: cmdline/apt-get.cc:1589 msgid "The update command takes no arguments" msgstr "De opdracht 'update' aanvaard geen argumenten" -#: cmdline/apt-get.cc:1653 +#: cmdline/apt-get.cc:1652 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "We mogen geen dingen verwijderen, kan AutoRemover niet starten" -#: cmdline/apt-get.cc:1748 +#: cmdline/apt-get.cc:1756 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1087,53 +1128,50 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1751 cmdline/apt-get.cc:1921 +#: cmdline/apt-get.cc:1759 cmdline/apt-get.cc:1929 msgid "The following information may help to resolve the situation:" msgstr "De volgende informatie helpt u mogelijk verder:" -#: cmdline/apt-get.cc:1755 +#: cmdline/apt-get.cc:1763 msgid "Internal Error, AutoRemover broke stuff" msgstr "Interne fout, AutoRemover heeft dingen stukgemaakt" -#: cmdline/apt-get.cc:1762 -#, fuzzy +#: cmdline/apt-get.cc:1770 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" "The following packages were automatically installed and are no longer " "required:" msgstr[0] "" -"De volgende pakketten zijn automatisch geïnstalleerd en zijn niet langer " -"nodig:" +"Het volgende pakket is automatisch geïnstalleerd en is niet langer nodig:" msgstr[1] "" "De volgende pakketten zijn automatisch geïnstalleerd en zijn niet langer " "nodig:" -#: cmdline/apt-get.cc:1766 -#, fuzzy, c-format +#: cmdline/apt-get.cc:1774 +#, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" "%lu packages were automatically installed and are no longer required.\n" -msgstr[0] "" -"%lu pakketten zijn automatisch geïnstalleerd en zijn niet langer nodig.\n" +msgstr[0] "%lu pakket is automatisch geïnstalleerd en is niet langer nodig.\n" msgstr[1] "" "%lu pakketten zijn automatisch geïnstalleerd en zijn niet langer nodig.\n" -#: cmdline/apt-get.cc:1768 +#: cmdline/apt-get.cc:1776 msgid "Use 'apt-get autoremove' to remove them." msgstr "U kunt deze verwijderen via 'apt-get autoremove'." -#: cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1795 msgid "Internal error, AllUpgrade broke stuff" msgstr "Interne fout, AllUpgrade heeft dingen stukgemaakt" -#: cmdline/apt-get.cc:1886 +#: cmdline/apt-get.cc:1894 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "" "U wilt waarschijnlijk 'apt-get -f install' uitvoeren om volgende op te " "lossen:" -#: cmdline/apt-get.cc:1890 +#: cmdline/apt-get.cc:1898 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1141,7 +1179,7 @@ msgstr "" "Er zijn niet-voldane vereisten. U kunt best 'apt-get -f install' uitvoeren " "zonder pakketten op te geven, (of u kunt zelf een oplossing specificeren)." -#: cmdline/apt-get.cc:1906 +#: cmdline/apt-get.cc:1914 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1152,171 +1190,181 @@ msgstr "" "een onmogelijke situatie gevraagd hebt of dat u de 'unstable'-distributie \n" "gebruikt en sommige benodigde pakketten nog vastzitten in 'incoming'." -#: cmdline/apt-get.cc:1924 +#: cmdline/apt-get.cc:1932 msgid "Broken packages" msgstr "Niet-werkende pakketten:" -#: cmdline/apt-get.cc:1950 +#: cmdline/apt-get.cc:1958 msgid "The following extra packages will be installed:" msgstr "De volgende extra pakketten zullen geïnstalleerd worden:" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2048 msgid "Suggested packages:" msgstr "Voorgestelde pakketten:" -#: cmdline/apt-get.cc:2041 +#: cmdline/apt-get.cc:2049 msgid "Recommended packages:" msgstr "Aanbevolen pakketten:" -#: cmdline/apt-get.cc:2083 +#: cmdline/apt-get.cc:2091 #, c-format msgid "Couldn't find package %s" msgstr "Kon pakket %s niet vinden" -#: cmdline/apt-get.cc:2090 cmdline/apt-mark.cc:61 -#, fuzzy, c-format +#: cmdline/apt-get.cc:2098 cmdline/apt-mark.cc:61 +#, c-format msgid "%s set to automatically installed.\n" -msgstr "%s is ingesteld voor handmatige installatie.\n" +msgstr "%s is ingesteld op automatische geïnstalleerd.\n" -#: cmdline/apt-get.cc:2098 cmdline/apt-mark.cc:105 +#: cmdline/apt-get.cc:2106 cmdline/apt-mark.cc:105 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:2114 +#: cmdline/apt-get.cc:2122 msgid "Calculating upgrade... " msgstr "Opwaardering wordt doorgerekend... " -#: cmdline/apt-get.cc:2117 methods/ftp.cc:707 methods/connect.cc:111 +#: cmdline/apt-get.cc:2125 methods/ftp.cc:708 methods/connect.cc:111 msgid "Failed" msgstr "Mislukt" -#: cmdline/apt-get.cc:2122 +#: cmdline/apt-get.cc:2130 msgid "Done" msgstr "Klaar" -#: cmdline/apt-get.cc:2189 cmdline/apt-get.cc:2197 +#: cmdline/apt-get.cc:2197 cmdline/apt-get.cc:2205 msgid "Internal error, problem resolver broke stuff" msgstr "Interne fout, probleemoplosser heeft dingen stukgemaakt" -#: cmdline/apt-get.cc:2221 cmdline/apt-get.cc:2254 +#: cmdline/apt-get.cc:2233 cmdline/apt-get.cc:2269 msgid "Unable to lock the download directory" msgstr "Kon de ophaalmap niet vergrendelen" -#: cmdline/apt-get.cc:2305 +#: cmdline/apt-get.cc:2320 #, c-format msgid "Downloading %s %s" msgstr "" -#: cmdline/apt-get.cc:2361 +#: cmdline/apt-get.cc:2376 msgid "Must specify at least one package to fetch source for" msgstr "" "U dient minstens 1 pakket op te geven waarvan de broncode opgehaald moet " "worden" -#: cmdline/apt-get.cc:2401 cmdline/apt-get.cc:2713 +#: cmdline/apt-get.cc:2416 cmdline/apt-get.cc:2728 #, c-format msgid "Unable to find a source package for %s" msgstr "Kan geen bronpakket vinden voor %s" -#: cmdline/apt-get.cc:2418 +#: cmdline/apt-get.cc:2433 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" +"MERK OP: Het verpakken van '%s' wordt bijgehouden in het versiebeheersysteem " +"'%s' op:\n" +"%s\n" -#: cmdline/apt-get.cc:2423 +#: cmdline/apt-get.cc:2438 #, c-format msgid "" "Please use:\n" "bzr get %s\n" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" +"Gebruik:\n" +"bzr get %s\n" +"om de nieuwste (mogelijk nog niet uit uitgebrachte) versie van het pakket op " +"te halen.\n" -#: cmdline/apt-get.cc:2476 +#: cmdline/apt-get.cc:2491 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Reeds opgehaald bestand '%s' wordt overgeslagen\n" -#: cmdline/apt-get.cc:2513 +#: cmdline/apt-get.cc:2528 #, c-format msgid "You don't have enough free space in %s" msgstr "U heeft niet voldoende vrije schijfruimte op %s" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2522 +#: cmdline/apt-get.cc:2537 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Moet %sB/%sB aan bronarchieven ophalen.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2527 +#: cmdline/apt-get.cc:2542 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Moet %sB aan bronarchieven ophalen.\n" -#: cmdline/apt-get.cc:2533 +#: cmdline/apt-get.cc:2548 #, c-format msgid "Fetch source %s\n" msgstr "Ophalen bron %s\n" -#: cmdline/apt-get.cc:2571 +#: cmdline/apt-get.cc:2586 msgid "Failed to fetch some archives." msgstr "Ophalen van sommige archieven is mislukt." -#: cmdline/apt-get.cc:2602 +#: cmdline/apt-get.cc:2617 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Het uitpakken van de reeds uitgepakte bron in %s wordt overgeslagen\n" -#: cmdline/apt-get.cc:2614 +#: cmdline/apt-get.cc:2629 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Uitpakopdracht '%s' is mislukt.\n" -#: cmdline/apt-get.cc:2615 +#: cmdline/apt-get.cc:2630 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Gelieve na te gaan of het 'dpkg-dev'-pakket geïnstalleerd is.\n" -#: cmdline/apt-get.cc:2637 +#: cmdline/apt-get.cc:2652 #, c-format msgid "Build command '%s' failed.\n" msgstr "Bouwopdracht '%s' is mislukt.\n" -#: cmdline/apt-get.cc:2657 +#: cmdline/apt-get.cc:2672 msgid "Child process failed" msgstr "Dochterproces is mislukt" -#: cmdline/apt-get.cc:2676 +#: cmdline/apt-get.cc:2691 msgid "Must specify at least one package to check builddeps for" msgstr "" "U dient tenminste één pakket op te geven om de bouwvereisten van te " "controleren" -#: cmdline/apt-get.cc:2701 +#: cmdline/apt-get.cc:2716 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:2718 +#: cmdline/apt-get.cc:2733 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Kan de informatie over de bouwvereisten voor %s niet ophalen" -#: cmdline/apt-get.cc:2738 +#: cmdline/apt-get.cc:2753 #, c-format msgid "%s has no build depends.\n" msgstr "%s heeft geen bouwvereisten.\n" -#: cmdline/apt-get.cc:2868 +#: cmdline/apt-get.cc:2883 #, fuzzy, c-format +#| msgid "" +#| "%s dependency for %s cannot be satisfied because the package %s cannot be " +#| "found" msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" @@ -1324,7 +1372,7 @@ msgstr "" "De vereiste %s van pakket %s kan niet voldaan worden omdat pakket %s " "onvindbaar is" -#: cmdline/apt-get.cc:2889 +#: cmdline/apt-get.cc:2904 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1333,15 +1381,18 @@ msgstr "" "De vereiste %s van pakket %s kan niet voldaan worden omdat pakket %s " "onvindbaar is" -#: cmdline/apt-get.cc:2912 +#: cmdline/apt-get.cc:2927 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Voldoen van Vereiste %s van pakket %s is mislukt: geïnstalleerde versie %s " "is te nieuw" -#: cmdline/apt-get.cc:2951 +#: cmdline/apt-get.cc:2966 #, fuzzy, c-format +#| msgid "" +#| "%s dependency for %s cannot be satisfied because no available versions of " +#| "package %s can satisfy version requirements" msgid "" "%s dependency for %s cannot be satisfied because candidate version of " "package %s can't satisfy version requirements" @@ -1349,8 +1400,11 @@ msgstr "" "De vereiste %s van pakket %s kan niet voldaan worden omdat er geen " "beschikbare versies zijn van pakket %s die aan de versievereisten voldoen" -#: cmdline/apt-get.cc:2957 +#: cmdline/apt-get.cc:2972 #, fuzzy, c-format +#| msgid "" +#| "%s dependency for %s cannot be satisfied because the package %s cannot be " +#| "found" msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" @@ -1358,31 +1412,75 @@ msgstr "" "De vereiste %s van pakket %s kan niet voldaan worden omdat pakket %s " "onvindbaar is" -#: cmdline/apt-get.cc:2980 +#: cmdline/apt-get.cc:2995 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Voldoen van de vereiste %s van pakket %s is mislukt: %s" -#: cmdline/apt-get.cc:2996 +#: cmdline/apt-get.cc:3011 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Bouwvereisten voor %s konden niet voldaan worden." -#: cmdline/apt-get.cc:3001 +#: cmdline/apt-get.cc:3016 msgid "Failed to process build dependencies" msgstr "Verwerken van de bouwvereisten is mislukt" -#: cmdline/apt-get.cc:3094 cmdline/apt-get.cc:3106 +#: cmdline/apt-get.cc:3109 cmdline/apt-get.cc:3121 #, fuzzy, c-format +#| msgid "Connecting to %s (%s)" msgid "Changelog for %s (%s)" msgstr "Er wordt verbinding gemaakt met %s (%s)" -#: cmdline/apt-get.cc:3225 +#: cmdline/apt-get.cc:3240 msgid "Supported modules:" msgstr "Ondersteunde modules:" -#: cmdline/apt-get.cc:3266 +#: cmdline/apt-get.cc:3281 #, fuzzy +#| msgid "" +#| "Usage: apt-get [options] command\n" +#| " apt-get [options] install|remove pkg1 [pkg2 ...]\n" +#| " apt-get [options] source pkg1 [pkg2 ...]\n" +#| "\n" +#| "apt-get is a simple command line interface for downloading and\n" +#| "installing packages. The most frequently used commands are update\n" +#| "and install.\n" +#| "\n" +#| "Commands:\n" +#| " update - Retrieve new lists of packages\n" +#| " upgrade - Perform an upgrade\n" +#| " install - Install new packages (pkg is libc6 not libc6.deb)\n" +#| " remove - Remove packages\n" +#| " autoremove - Remove automatically all unused packages\n" +#| " purge - Remove packages and config files\n" +#| " source - Download source archives\n" +#| " build-dep - Configure build-dependencies for source packages\n" +#| " dist-upgrade - Distribution upgrade, see apt-get(8)\n" +#| " dselect-upgrade - Follow dselect selections\n" +#| " clean - Erase downloaded archive files\n" +#| " autoclean - Erase old downloaded archive files\n" +#| " check - Verify that there are no broken dependencies\n" +#| " markauto - Mark the given packages as automatically installed\n" +#| " unmarkauto - Mark the given packages as manually installed\n" +#| "\n" +#| "Options:\n" +#| " -h This help text.\n" +#| " -q Loggable output - no progress indicator\n" +#| " -qq No output except for errors\n" +#| " -d Download only - do NOT install or unpack archives\n" +#| " -s No-act. Perform ordering simulation\n" +#| " -y Assume Yes to all queries and do not prompt\n" +#| " -f Attempt to correct a system with broken dependencies in place\n" +#| " -m Attempt to continue if archives are unlocatable\n" +#| " -u Show a list of upgraded packages as well\n" +#| " -b Build the source package after fetching it\n" +#| " -V Show verbose version numbers\n" +#| " -c=? Read this configuration file\n" +#| " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#| "See the apt-get(8), sources.list(5) and apt.conf(5) manual\n" +#| "pages for more information and options.\n" +#| " This APT has Super Cow Powers.\n" msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1470,7 +1568,7 @@ msgstr "" "voor meer informatie en opties.\n" " Deze APT heeft Super Koe kracht.\n" -#: cmdline/apt-get.cc:3429 +#: cmdline/apt-get.cc:3444 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1521,36 +1619,43 @@ msgstr "" #: cmdline/apt-mark.cc:46 #, fuzzy, c-format +#| msgid "but it is not installed" msgid "%s can not be marked as it is not installed.\n" msgstr "maar het is niet geïnstalleerd" #: cmdline/apt-mark.cc:52 #, fuzzy, c-format +#| msgid "%s set to manually installed.\n" msgid "%s was already set to manually installed.\n" msgstr "%s is ingesteld voor handmatige installatie.\n" #: cmdline/apt-mark.cc:54 #, fuzzy, c-format +#| msgid "%s set to automatically installed.\n" msgid "%s was already set to automatically installed.\n" -msgstr "%s is ingesteld voor handmatige installatie.\n" +msgstr "%s is ingesteld op automatische geïnstalleerd.\n" #: cmdline/apt-mark.cc:169 #, fuzzy, c-format +#| msgid "%s is already the newest version.\n" msgid "%s was already set on hold.\n" msgstr "%s is reeds de nieuwste versie.\n" #: cmdline/apt-mark.cc:171 #, fuzzy, c-format +#| msgid "%s is already the newest version.\n" msgid "%s was already not hold.\n" msgstr "%s is reeds de nieuwste versie.\n" #: cmdline/apt-mark.cc:185 cmdline/apt-mark.cc:207 #, fuzzy, c-format +#| msgid "%s set to manually installed.\n" msgid "%s set on hold.\n" msgstr "%s is ingesteld voor handmatige installatie.\n" #: cmdline/apt-mark.cc:187 cmdline/apt-mark.cc:212 #, fuzzy, c-format +#| msgid "Failed to open %s" msgid "Canceled hold on %s.\n" msgstr "Openen van %s is mislukt" @@ -1787,8 +1892,8 @@ msgstr "Het bestand %s/%s overschrijft het bestand van pakket %s" #. Only warn if there is no sources.list file. #: apt-inst/extract.cc:462 apt-pkg/contrib/cdromutl.cc:179 #: apt-pkg/contrib/fileutl.cc:343 apt-pkg/sourcelist.cc:204 -#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:450 apt-pkg/init.cc:104 -#: apt-pkg/init.cc:112 apt-pkg/clean.cc:33 apt-pkg/policy.cc:352 +#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:454 apt-pkg/init.cc:103 +#: apt-pkg/init.cc:111 apt-pkg/clean.cc:33 apt-pkg/policy.cc:353 #: methods/mirror.cc:91 #, c-format msgid "Unable to read %s" @@ -1819,9 +1924,9 @@ msgid "The info and temp directories need to be on the same filesystem" msgstr "" "De 'info'- en de 'temp'-mappen dienen op hetzelfde bestandsysteem te staan" -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1048 -#: apt-pkg/pkgcachegen.cc:1152 apt-pkg/pkgcachegen.cc:1158 -#: apt-pkg/pkgcachegen.cc:1320 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1063 +#: apt-pkg/pkgcachegen.cc:1167 apt-pkg/pkgcachegen.cc:1173 +#: apt-pkg/pkgcachegen.cc:1335 msgid "Reading package lists" msgstr "Pakketlijsten worden ingelezen" @@ -1942,22 +2047,22 @@ msgid "Read error from %s process" msgstr "Leesfout door proces %s" #: methods/bzip2.cc:140 methods/bzip2.cc:149 methods/copy.cc:43 -#: methods/gzip.cc:92 methods/gzip.cc:101 methods/rred.cc:524 -#: methods/rred.cc:533 +#: methods/gzip.cc:92 methods/gzip.cc:101 methods/rred.cc:527 +#: methods/rred.cc:536 msgid "Failed to stat" msgstr "stat is mislukt" #: methods/bzip2.cc:146 methods/copy.cc:80 methods/gzip.cc:98 -#: methods/rred.cc:530 +#: methods/rred.cc:533 msgid "Failed to set modification time" msgstr "Instellen van de aanpassingstijd is mislukt" -#: methods/cdrom.cc:199 +#: methods/cdrom.cc:200 #, c-format msgid "Unable to read the cdrom database %s" msgstr "Kan de cd databank %s niet lezen" -#: methods/cdrom.cc:208 +#: methods/cdrom.cc:209 msgid "" "Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update " "cannot be used to add new CD-ROMs" @@ -1965,21 +2070,21 @@ msgstr "" "Om deze APT deze CD te laten herkennen kunt u best apt-cdrom gebruiken. 'apt-" "get update' is niet in staat om nieuwe CDs toe te voegen" -#: methods/cdrom.cc:218 +#: methods/cdrom.cc:219 msgid "Wrong CD-ROM" msgstr "Verkeerde CD" -#: methods/cdrom.cc:245 +#: methods/cdrom.cc:246 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "" "Kan de CD in %s niet loskoppelen, mogelijk wordt die nog steeds gebruikt." -#: methods/cdrom.cc:250 +#: methods/cdrom.cc:251 msgid "Disk not found." msgstr "Schijf niet gevonden" -#: methods/cdrom.cc:258 methods/file.cc:79 methods/rsh.cc:265 +#: methods/cdrom.cc:259 methods/file.cc:79 methods/rsh.cc:265 msgid "File not found" msgstr "Bestand niet gevonden" @@ -1988,34 +2093,34 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "Ongeldige URI, lokale URIs mogen niet beginnen met //" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:168 +#: methods/ftp.cc:169 msgid "Logging in" msgstr "Bezig met aanmelden" -#: methods/ftp.cc:174 +#: methods/ftp.cc:175 msgid "Unable to determine the peer name" msgstr "Kan de 'peer'-naam niet bepalen" -#: methods/ftp.cc:179 +#: methods/ftp.cc:180 msgid "Unable to determine the local name" msgstr "Kan de lokale naam niet bepalen" -#: methods/ftp.cc:210 methods/ftp.cc:238 +#: methods/ftp.cc:211 methods/ftp.cc:239 #, c-format msgid "The server refused the connection and said: %s" msgstr "Onze verbinding is door de server geweigerd met bericht: %s" -#: methods/ftp.cc:216 +#: methods/ftp.cc:217 #, c-format msgid "USER failed, server said: %s" msgstr "USER mislukt; bericht van server: %s" -#: methods/ftp.cc:223 +#: methods/ftp.cc:224 #, c-format msgid "PASS failed, server said: %s" msgstr "PASS mislukt; bericht van server: %s" -#: methods/ftp.cc:243 +#: methods/ftp.cc:244 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -2023,114 +2128,114 @@ msgstr "" "Er was een proxy-server opgegeven, maar geen aanmeldscript, Acquire::ftp::" "ProxyLogin is leeg." -#: methods/ftp.cc:271 +#: methods/ftp.cc:272 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "Aanmeldscriptopdracht '%s' is mislukt; bericht van server: %s" -#: methods/ftp.cc:297 +#: methods/ftp.cc:298 #, c-format msgid "TYPE failed, server said: %s" msgstr "TYPE mislukt; bericht van server: %s" -#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:184 methods/rsh.cc:227 +#: methods/ftp.cc:336 methods/ftp.cc:447 methods/rsh.cc:184 methods/rsh.cc:227 msgid "Connection timeout" msgstr "Verbinding is verlopen" -#: methods/ftp.cc:341 +#: methods/ftp.cc:342 msgid "Server closed the connection" msgstr "Verbinding is verbroken door de server" -#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:820 methods/rsh.cc:191 +#: methods/ftp.cc:345 apt-pkg/contrib/fileutl.cc:831 methods/rsh.cc:191 msgid "Read error" msgstr "Leesfout" -#: methods/ftp.cc:351 methods/rsh.cc:198 +#: methods/ftp.cc:352 methods/rsh.cc:198 msgid "A response overflowed the buffer." msgstr "Een reactie deed de buffer overlopen" -#: methods/ftp.cc:368 methods/ftp.cc:380 +#: methods/ftp.cc:369 methods/ftp.cc:381 msgid "Protocol corruption" msgstr "Protocolcorruptie" -#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:862 methods/rsh.cc:233 +#: methods/ftp.cc:453 apt-pkg/contrib/fileutl.cc:873 methods/rsh.cc:233 msgid "Write error" msgstr "Schrijffout" -#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734 +#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735 msgid "Could not create a socket" msgstr "Kon geen socket aanmaken" -#: methods/ftp.cc:703 +#: methods/ftp.cc:704 msgid "Could not connect data socket, connection timed out" msgstr "Kon de datasocket niet verbinden, de verbinding verliep" -#: methods/ftp.cc:709 +#: methods/ftp.cc:710 msgid "Could not connect passive socket." msgstr "Kon de passieve socket niet verbinden." -#: methods/ftp.cc:727 +#: methods/ftp.cc:728 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo kon geen luistersocket verkrijgen" -#: methods/ftp.cc:741 +#: methods/ftp.cc:742 msgid "Could not bind a socket" msgstr "Kon geen socket binden" -#: methods/ftp.cc:745 +#: methods/ftp.cc:746 msgid "Could not listen on the socket" msgstr "Kon niet op de socket niet luisteren" -#: methods/ftp.cc:752 +#: methods/ftp.cc:753 msgid "Could not determine the socket's name" msgstr "Kon de socketnaam niet bepalen" -#: methods/ftp.cc:784 +#: methods/ftp.cc:785 msgid "Unable to send PORT command" msgstr "Kan PORT-commando niet verzenden" -#: methods/ftp.cc:794 +#: methods/ftp.cc:795 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Onbekende adresfamilie %u (AF_*)" -#: methods/ftp.cc:803 +#: methods/ftp.cc:804 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT is mislukt; bericht van server: %s" -#: methods/ftp.cc:823 +#: methods/ftp.cc:824 msgid "Data socket connect timed out" msgstr "Datasocket verbinding is verlopen" -#: methods/ftp.cc:830 +#: methods/ftp.cc:831 msgid "Unable to accept connection" msgstr "Kan de verbinding niet aanvaarden" -#: methods/ftp.cc:869 methods/http.cc:1023 methods/rsh.cc:303 +#: methods/ftp.cc:870 methods/http.cc:1023 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Probleem bij het hashen van het bestand" -#: methods/ftp.cc:882 +#: methods/ftp.cc:883 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Kan bestand niet ophalen; bericht van server: %s" -#: methods/ftp.cc:897 methods/rsh.cc:322 +#: methods/ftp.cc:898 methods/rsh.cc:322 msgid "Data socket timed out" msgstr "Datasocket verliep" -#: methods/ftp.cc:927 +#: methods/ftp.cc:928 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Data transfer is mislukt, server zei: %s" #. Get the files information -#: methods/ftp.cc:1004 +#: methods/ftp.cc:1005 msgid "Query" msgstr "Zoekopdracht" -#: methods/ftp.cc:1116 +#: methods/ftp.cc:1117 msgid "Unable to invoke " msgstr "Aanroepen mislukt van " @@ -2203,10 +2308,9 @@ msgid "At least one invalid signature was encountered." msgstr "Er is tenminste één ongeldige ondertekening gevonden." #: methods/gpgv.cc:175 -#, fuzzy msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" -"Kon '%s' niet uitvoeren om ondertekening te verifiëren (is gpgv " +"Kon 'gpgv' niet uitvoeren om ondertekening te verifiëren (is gpgv " "geïnstalleerd?)" #: methods/gpgv.cc:180 @@ -2310,9 +2414,9 @@ msgid "Can't mmap an empty file" msgstr "Kan een leeg bestand niet mmappen" #: apt-pkg/contrib/mmap.cc:89 -#, fuzzy, c-format +#, c-format msgid "Couldn't duplicate file descriptor %i" -msgstr "Kon geen pijp openen voor %s" +msgstr "Kon de bestandsindicator %i niet dupliceren" #: apt-pkg/contrib/mmap.cc:97 apt-pkg/contrib/mmap.cc:258 #, c-format @@ -2320,14 +2424,12 @@ msgid "Couldn't make mmap of %lu bytes" msgstr "Kon van %lu bytes geen mmap maken" #: apt-pkg/contrib/mmap.cc:124 -#, fuzzy msgid "Unable to close mmap" -msgstr "Kan %s niet openen" +msgstr "Kan mmap niet sluiten" #: apt-pkg/contrib/mmap.cc:152 apt-pkg/contrib/mmap.cc:180 -#, fuzzy msgid "Unable to synchronize mmap" -msgstr "Aanroepen mislukt van " +msgstr "Kan mmap niet synchronizeren" #: apt-pkg/contrib/mmap.cc:310 #, c-format @@ -2344,11 +2446,15 @@ msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " "reached." msgstr "" +"Kan het formaat van de MMap niet vergroten omdat de grens van %lu bytes al " +"is bereikt" #: apt-pkg/contrib/mmap.cc:412 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" +"Kan het formaat van de MMap niet vergroten omdat het automatisch vergroten " +"door de gebruiker is uitgeschakeld." #. d means days, h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:371 @@ -2374,7 +2480,7 @@ msgstr "%limin %lis" msgid "%lis" msgstr "%lis" -#: apt-pkg/contrib/strutl.cc:1138 +#: apt-pkg/contrib/strutl.cc:1137 #, c-format msgid "Selection %s not found" msgstr "Selectie %s niet gevonden" @@ -2427,11 +2533,10 @@ msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Syntaxfout %s:%u: Niet-ondersteunde richtlijn '%s'" #: apt-pkg/contrib/configuration.cc:790 -#, fuzzy, c-format +#, c-format msgid "Syntax error %s:%u: clear directive requires an option tree as argument" msgstr "" -"Syntaxfout %s:%u: Richtlijnen kunnen enkel op het hoogste niveau gegeven " -"worden" +"Syntaxfout %s:%u: De richtlijn 'clear' vereist een optieboom als argument" #: apt-pkg/contrib/configuration.cc:840 #, c-format @@ -2453,45 +2558,45 @@ msgstr "%c%s... Klaar" msgid "Command line option '%c' [from %s] is not known." msgstr "Commandoregel-optie '%c' [van %s] is onbekend." -#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111 -#: apt-pkg/contrib/cmndline.cc:119 +#: apt-pkg/contrib/cmndline.cc:101 apt-pkg/contrib/cmndline.cc:109 +#: apt-pkg/contrib/cmndline.cc:117 #, c-format msgid "Command line option %s is not understood" msgstr "Commandoregel-optie %s wordt niet begrepen" -#: apt-pkg/contrib/cmndline.cc:124 +#: apt-pkg/contrib/cmndline.cc:122 #, c-format msgid "Command line option %s is not boolean" msgstr "Commandoregel-optie %s is niet booleaans" -#: apt-pkg/contrib/cmndline.cc:165 apt-pkg/contrib/cmndline.cc:186 +#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 #, c-format msgid "Option %s requires an argument." msgstr "Optie %s vereist een argument." -#: apt-pkg/contrib/cmndline.cc:200 apt-pkg/contrib/cmndline.cc:206 +#: apt-pkg/contrib/cmndline.cc:197 apt-pkg/contrib/cmndline.cc:203 #, c-format msgid "Option %s: Configuration item specification must have an =<val>." msgstr "" "Optie %s: De specificatie van het configuratie-item dient een =<waarde> te " "bevatten." -#: apt-pkg/contrib/cmndline.cc:236 +#: apt-pkg/contrib/cmndline.cc:232 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "Optie %s vereist een integer getal als argument, niet '%s'" -#: apt-pkg/contrib/cmndline.cc:267 +#: apt-pkg/contrib/cmndline.cc:263 #, c-format msgid "Option '%s' is too long" msgstr "Optie '%s' is te lang" -#: apt-pkg/contrib/cmndline.cc:300 +#: apt-pkg/contrib/cmndline.cc:295 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "Waarde %s wordt niet begrepen, probeer 'true' of 'false'." -#: apt-pkg/contrib/cmndline.cc:350 +#: apt-pkg/contrib/cmndline.cc:345 #, c-format msgid "Invalid operation %s" msgstr "Ongeldige operatie %s" @@ -2502,7 +2607,7 @@ msgid "Unable to stat the mount point %s" msgstr "Kan de status van het aanhechtpunt %s niet opvragen" #: apt-pkg/contrib/cdromutl.cc:175 apt-pkg/contrib/cdromutl.cc:209 -#: apt-pkg/acquire.cc:456 apt-pkg/acquire.cc:481 apt-pkg/clean.cc:39 +#: apt-pkg/acquire.cc:460 apt-pkg/acquire.cc:485 apt-pkg/clean.cc:39 #: methods/mirror.cc:97 #, c-format msgid "Unable to change to %s" @@ -2556,72 +2661,72 @@ msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:679 +#: apt-pkg/contrib/fileutl.cc:690 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Er is gewacht op %s, maar die kwam niet" -#: apt-pkg/contrib/fileutl.cc:691 +#: apt-pkg/contrib/fileutl.cc:702 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Subproces %s ontving een segmentatiefout." -#: apt-pkg/contrib/fileutl.cc:693 +#: apt-pkg/contrib/fileutl.cc:704 #, c-format msgid "Sub-process %s received signal %u." msgstr "Subproces %s ontving signaal %u." -#: apt-pkg/contrib/fileutl.cc:697 +#: apt-pkg/contrib/fileutl.cc:708 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Subproces %s gaf de foutcode %u terug" -#: apt-pkg/contrib/fileutl.cc:699 +#: apt-pkg/contrib/fileutl.cc:710 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Subproces %s sloot onverwacht af" -#: apt-pkg/contrib/fileutl.cc:764 apt-pkg/indexcopy.cc:673 +#: apt-pkg/contrib/fileutl.cc:775 apt-pkg/indexcopy.cc:673 #, c-format msgid "Could not open file %s" msgstr "Kon het bestand %s niet openen" -#: apt-pkg/contrib/fileutl.cc:781 -#, fuzzy, c-format +#: apt-pkg/contrib/fileutl.cc:792 +#, c-format msgid "Could not open file descriptor %d" -msgstr "Kon geen pijp openen voor %s" +msgstr "Kon de bestandsindicator %d niet openen" -#: apt-pkg/contrib/fileutl.cc:841 +#: apt-pkg/contrib/fileutl.cc:852 #, c-format msgid "read, still have %lu to read but none left" msgstr "lees, de laatste te lezen %lu zijn niet beschikbaar" -#: apt-pkg/contrib/fileutl.cc:874 +#: apt-pkg/contrib/fileutl.cc:885 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "schrijf, de laatste %lu konden niet weggeschreven worden" -#: apt-pkg/contrib/fileutl.cc:1010 -#, fuzzy, c-format +#: apt-pkg/contrib/fileutl.cc:1021 +#, c-format msgid "Problem closing the gzip file %s" -msgstr "Probleem bij het afsluiten van het bestand" +msgstr "Probleem bij het afsluiten van het gzip-bestand %s" -#: apt-pkg/contrib/fileutl.cc:1013 -#, fuzzy, c-format +#: apt-pkg/contrib/fileutl.cc:1024 +#, c-format msgid "Problem closing the file %s" -msgstr "Probleem bij het afsluiten van het bestand" +msgstr "Probleem bij het afsluiten van het bestand %s" -#: apt-pkg/contrib/fileutl.cc:1018 -#, fuzzy, c-format +#: apt-pkg/contrib/fileutl.cc:1029 +#, c-format msgid "Problem renaming the file %s to %s" -msgstr "Probleem bij het synchroniseren van het bestand" +msgstr "Probleem bij het hernoemen van '%s' naar '%s'" -#: apt-pkg/contrib/fileutl.cc:1029 -#, fuzzy, c-format +#: apt-pkg/contrib/fileutl.cc:1040 +#, c-format msgid "Problem unlinking the file %s" -msgstr "Probleem bij het ontlinken van het bestand" +msgstr "Probleem bij het ontlinken van het bestand %s" -#: apt-pkg/contrib/fileutl.cc:1042 +#: apt-pkg/contrib/fileutl.cc:1053 msgid "Problem syncing the file" msgstr "Probleem bij het synchroniseren van het bestand" @@ -2739,29 +2844,30 @@ msgid "Unable to parse package file %s (2)" msgstr "Kon pakketbestand %s niet ontleden (2)" #: apt-pkg/sourcelist.cc:92 -#, fuzzy, c-format +#, c-format msgid "Malformed line %lu in source list %s ([option] unparseable)" -msgstr "Misvormde regel %lu in bronlijst %s (dist parse)" +msgstr "Misvormde regel %lu in bronlijst %s ([optie] onbegrijpelijk)" #: apt-pkg/sourcelist.cc:95 -#, fuzzy, c-format +#, c-format msgid "Malformed line %lu in source list %s ([option] too short)" -msgstr "Misvormde regel %lu in bronlijst %s (dist)" +msgstr "Misvormde regel %lu in bronlijst %s ([optie] te kort)" #: apt-pkg/sourcelist.cc:106 -#, fuzzy, c-format +#, c-format msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" -msgstr "Misvormde regel %lu in bronlijst %s (dist parse)" +msgstr "Misvormde regel %lu in bronlijst %s ([%s] is geen toekenning)" #: apt-pkg/sourcelist.cc:112 -#, fuzzy, c-format +#, c-format msgid "Malformed line %lu in source list %s ([%s] has no key)" -msgstr "Misvormde regel %lu in bronlijst %s (dist parse)" +msgstr "Misvormde regel %lu in bronlijst %s ([%s] heeft geen sleutel)" #: apt-pkg/sourcelist.cc:115 -#, fuzzy, c-format +#, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" -msgstr "Misvormde regel %lu in bronlijst %s (dist parse)" +msgstr "" +"Misvormde regel %lu in bronlijst %s ([%s] sleutel %s heeft geen waarde)" #: apt-pkg/sourcelist.cc:128 #, c-format @@ -2808,8 +2914,8 @@ msgstr "Misvormde regel %u in bronlijst %s (type)" msgid "Type '%s' is not known on line %u in source list %s" msgstr "Type '%s' op regel %u in bronlijst %s is onbekend" -#: apt-pkg/packagemanager.cc:335 apt-pkg/packagemanager.cc:623 -#, fuzzy, c-format +#: apt-pkg/packagemanager.cc:335 apt-pkg/packagemanager.cc:645 +#, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" @@ -2830,7 +2936,7 @@ msgstr "" "te activeren." #: apt-pkg/packagemanager.cc:501 -#, fuzzy, c-format +#, c-format msgid "" "Could not perform immediate configuration on already unpacked '%s'. Please " "see man 5 apt.conf under APT::Immediate-Configure for details." @@ -2863,8 +2969,11 @@ msgstr "" msgid "Unable to correct problems, you have held broken packages." msgstr "Kan problemen niet verhelpen, u houdt defecte pakketten vast." -#: apt-pkg/algorithms.cc:1464 apt-pkg/algorithms.cc:1466 +#: apt-pkg/algorithms.cc:1471 apt-pkg/algorithms.cc:1473 #, fuzzy +#| msgid "" +#| "Some index files failed to download, they have been ignored, or old ones " +#| "used instead." msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -2873,28 +2982,28 @@ msgstr "" "zijn oudere versies van gebruikt." #: apt-pkg/acquire.cc:79 -#, fuzzy, c-format +#, c-format msgid "List directory %spartial is missing." msgstr "Lijstmap %spartial is afwezig." #: apt-pkg/acquire.cc:83 -#, fuzzy, c-format +#, c-format msgid "Archives directory %spartial is missing." msgstr "Archiefmap %spartial is afwezig." #: apt-pkg/acquire.cc:91 -#, fuzzy, c-format +#, c-format msgid "Unable to lock directory %s" -msgstr "Kon de lijst-map niet vergrendelen" +msgstr "Kan de map %s niet vergrendelen" #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:857 +#: apt-pkg/acquire.cc:861 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "Bestand %li van %li wordt opgehaald (nog %s te gaan)" -#: apt-pkg/acquire.cc:859 +#: apt-pkg/acquire.cc:863 #, c-format msgid "Retrieving file %li of %li" msgstr "Bestand %li van %li wordt opgehaald" @@ -2916,12 +3025,12 @@ msgstr "" "Gelieve de schijf met label '%s' in het station '%s' te plaatsen en op " "'enter' te drukken." -#: apt-pkg/init.cc:147 +#: apt-pkg/init.cc:146 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Pakketbeheersysteem '%s' wordt niet ondersteund" -#: apt-pkg/init.cc:163 +#: apt-pkg/init.cc:162 msgid "Unable to determine a suitable packaging system type" msgstr "Kan geen geschikt pakketsysteemtype bepalen" @@ -2951,25 +3060,25 @@ msgstr "" msgid "The list of sources could not be read." msgstr "De lijst van bronnen kon niet gelezen worden." -#: apt-pkg/policy.cc:71 +#: apt-pkg/policy.cc:72 #, c-format msgid "" "The value '%s' is invalid for APT::Default-Release as such a release is not " "available in the sources" msgstr "" -#: apt-pkg/policy.cc:389 +#: apt-pkg/policy.cc:390 #, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "" "Ongeldige record in het voorkeurenbestand %s, 'Package' koptekst ontbreekt" -#: apt-pkg/policy.cc:411 +#: apt-pkg/policy.cc:412 #, c-format msgid "Did not understand pin type %s" msgstr "Pintype %s wordt niet begrepen" -#: apt-pkg/policy.cc:419 +#: apt-pkg/policy.cc:420 msgid "No priority (or zero) specified for pin" msgstr "Er is geen prioriteit (of nul) opgegeven voor deze pin" @@ -2977,92 +3086,92 @@ msgstr "Er is geen prioriteit (of nul) opgegeven voor deze pin" msgid "Cache has an incompatible versioning system" msgstr "Cache heeft een niet-compatibel versienummeringssysteem" -#: apt-pkg/pkgcachegen.cc:187 +#: apt-pkg/pkgcachegen.cc:190 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Fout tijdens verwerken van %s (NewPackage)" -#: apt-pkg/pkgcachegen.cc:204 +#: apt-pkg/pkgcachegen.cc:207 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Fout tijdens verwerken van %s (UsePackage1)" -#: apt-pkg/pkgcachegen.cc:242 +#: apt-pkg/pkgcachegen.cc:245 #, c-format msgid "Error occurred while processing %s (NewFileDesc1)" msgstr "Fout tijdens verwerken van %s (NewFileDesc1)" -#: apt-pkg/pkgcachegen.cc:274 +#: apt-pkg/pkgcachegen.cc:277 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Fout tijdens verwerken van %s (UsePackage2)" -#: apt-pkg/pkgcachegen.cc:278 +#: apt-pkg/pkgcachegen.cc:281 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Fout tijdens verwerken van %s (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:295 apt-pkg/pkgcachegen.cc:305 -#: apt-pkg/pkgcachegen.cc:313 -#, fuzzy, c-format +#: apt-pkg/pkgcachegen.cc:298 apt-pkg/pkgcachegen.cc:308 +#: apt-pkg/pkgcachegen.cc:316 +#, c-format msgid "Error occurred while processing %s (NewVersion%d)" -msgstr "Fout tijdens verwerken van %s (NewVersion1)" +msgstr "Fout tijdens verwerken van %s (NewVersion%d)" -#: apt-pkg/pkgcachegen.cc:309 +#: apt-pkg/pkgcachegen.cc:312 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Fout tijdens verwerken van %s (UsePackage3)" -#: apt-pkg/pkgcachegen.cc:342 +#: apt-pkg/pkgcachegen.cc:345 #, c-format msgid "Error occurred while processing %s (NewFileDesc2)" msgstr "Fout tijdens verwerken van %s (NewFileDesc2)" -#: apt-pkg/pkgcachegen.cc:348 +#: apt-pkg/pkgcachegen.cc:351 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "Wauw, u heeft meer pakketten dan deze APT aan kan." -#: apt-pkg/pkgcachegen.cc:351 +#: apt-pkg/pkgcachegen.cc:354 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Wauw, u heeft meer versies dan deze APT aan kan." -#: apt-pkg/pkgcachegen.cc:354 +#: apt-pkg/pkgcachegen.cc:357 msgid "Wow, you exceeded the number of descriptions this APT is capable of." msgstr "" "Wauw, u heeft het maximum aantal beschrijvingen dat deze APT aan kan " "overschreden." -#: apt-pkg/pkgcachegen.cc:357 +#: apt-pkg/pkgcachegen.cc:360 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "Wauw, u heeft meer afhankelijkheden dan deze APT aan kan." -#: apt-pkg/pkgcachegen.cc:386 +#: apt-pkg/pkgcachegen.cc:389 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Fout tijdens verwerken van %s (FindPkg)" -#: apt-pkg/pkgcachegen.cc:400 +#: apt-pkg/pkgcachegen.cc:403 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Fout tijdens verwerken van %s (CollectFileProvides)" -#: apt-pkg/pkgcachegen.cc:406 +#: apt-pkg/pkgcachegen.cc:409 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" "Pakket %s %s werd niet gevonden bij het verwerken van de " "bestandsafhankelijkheden" -#: apt-pkg/pkgcachegen.cc:960 +#: apt-pkg/pkgcachegen.cc:975 #, c-format msgid "Couldn't stat source package list %s" msgstr "Kon de status van de bronpakketlijst %s niet opvragen" -#: apt-pkg/pkgcachegen.cc:1065 +#: apt-pkg/pkgcachegen.cc:1080 msgid "Collecting File Provides" msgstr "Voorziene bestanden worden verzameld" -#: apt-pkg/pkgcachegen.cc:1259 apt-pkg/pkgcachegen.cc:1266 +#: apt-pkg/pkgcachegen.cc:1274 apt-pkg/pkgcachegen.cc:1281 msgid "IO Error saving source cache" msgstr "Invoer/Uitvoer-fout tijdens wegschrijven bronpakket-cache" @@ -3075,12 +3184,12 @@ msgstr "herbenoeming is mislukt, %s (%s -> %s)." msgid "MD5Sum mismatch" msgstr "MD5-som komt niet overeen" -#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1848 -#: apt-pkg/acquire-item.cc:1991 +#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1847 +#: apt-pkg/acquire-item.cc:1990 msgid "Hash Sum mismatch" msgstr "Hash-som komt niet overeen" -#: apt-pkg/acquire-item.cc:1388 +#: apt-pkg/acquire-item.cc:1387 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3089,40 +3198,44 @@ msgstr "" #: apt-pkg/acquire-item.cc:1403 #, fuzzy, c-format +#| msgid "Unable to parse Release file %s" msgid "Unable to find hash sum for '%s' in Release file" msgstr "Kon Release-bestand %s niet ontleden" -#: apt-pkg/acquire-item.cc:1439 +#: apt-pkg/acquire-item.cc:1438 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Er zijn geen publieke sleutels beschikbaar voor de volgende sleutel-IDs:\n" -#: apt-pkg/acquire-item.cc:1477 +#: apt-pkg/acquire-item.cc:1476 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1499 +#: apt-pkg/acquire-item.cc:1498 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" -msgstr "" +msgstr "Conflicterende distributie: %s (verwachtte %s, maar kreeg %s)" -#: apt-pkg/acquire-item.cc:1532 +#: apt-pkg/acquire-item.cc:1531 #, c-format msgid "" "A error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" +"Er is een fout opgetreden bij de handtekeningcontrole. De pakketbron is niet " +"bijgewerkt en de oude indexbestanden zullen worden gebruikt. GPG-fout: %s: " +"%s\n" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547 +#: apt-pkg/acquire-item.cc:1541 apt-pkg/acquire-item.cc:1546 #, c-format msgid "GPG error: %s: %s" -msgstr "" +msgstr "GPG-fout: %s: %s" -#: apt-pkg/acquire-item.cc:1639 +#: apt-pkg/acquire-item.cc:1638 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3131,8 +3244,11 @@ msgstr "" "Er kon geen bestand gevonden worden voor pakket %s. Dit kan betekenen dat u " "dit pakket handmatig moet repareren (wegens missende architectuur)" -#: apt-pkg/acquire-item.cc:1698 -#, c-format +#: apt-pkg/acquire-item.cc:1697 +#, fuzzy, c-format +#| msgid "" +#| "I wasn't able to locate file for the %s package. This might mean you need " +#| "to manually fix this package." msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package." @@ -3140,7 +3256,7 @@ msgstr "" "Er kon geen bestand gevonden worden voor pakket %s. Dit kan betekenen dat u " "dit pakket handmatig moet repareren." -#: apt-pkg/acquire-item.cc:1753 +#: apt-pkg/acquire-item.cc:1752 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -3148,7 +3264,7 @@ msgstr "" "De pakketindex-bestanden zijn beschadigd. Er is geen 'Filename:'-veld voor " "pakket %s." -#: apt-pkg/acquire-item.cc:1840 +#: apt-pkg/acquire-item.cc:1839 msgid "Size mismatch" msgstr "Grootte komt niet overeen" @@ -3168,14 +3284,14 @@ msgid "No Hash entry in Release file %s" msgstr "Geen Hash-vermelding in Release-bestand %s" #: apt-pkg/indexrecords.cc:110 -#, fuzzy, c-format +#, c-format msgid "Invalid 'Valid-Until' entry in Release file %s" -msgstr "Geen Hash-vermelding in Release-bestand %s" +msgstr "Geen 'Valid-Until'-vermelding in Release-bestand %s" -#: apt-pkg/indexrecords.cc:125 -#, fuzzy, c-format +#: apt-pkg/indexrecords.cc:129 +#, c-format msgid "Invalid 'Date' entry in Release file %s" -msgstr "Geen Hash-vermelding in Release-bestand %s" +msgstr "Geen 'Date'-vermelding in Release-bestand %s" #: apt-pkg/vendorlist.cc:71 #, c-format @@ -3272,22 +3388,22 @@ msgstr "Nieuwe bronlijst wordt weggeschreven\n" msgid "Source list entries for this disc are:\n" msgstr "Bronlijst-ingangen voor de schijf zijn:\n" -#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:928 +#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:927 #, c-format msgid "Wrote %i records.\n" msgstr "%i records weggeschreven.\n" -#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:930 +#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:929 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "%i records weggeschreven met %i missende bestanden.\n" -#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:933 +#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:932 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "%i records weggeschreven met %i niet overeenkomende bestanden\n" -#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:936 +#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:935 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@ -3331,19 +3447,21 @@ msgid "Version '%s' for '%s' was not found" msgstr "Versie '%s' voor '%s' is niet gevonden" #: apt-pkg/cacheset.cc:447 -#, fuzzy, c-format +#, c-format msgid "Couldn't find task '%s'" -msgstr "Kon taak %s niet vinden" +msgstr "Kon taak '%s' niet vinden" #: apt-pkg/cacheset.cc:454 -#, fuzzy, c-format +#, c-format msgid "Couldn't find any package by regex '%s'" -msgstr "Kon pakket %s niet vinden" +msgstr "Kon geen enkel pakket vinden bij regex '%s'" #: apt-pkg/cacheset.cc:467 -#, c-format +#, fuzzy, c-format +#| msgid "Can't select versions from package '%s' as it purely virtual" msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" +"Kan geen versies selecteren voor pakket '%s' omdat deze zuiver virtueel is" #: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483 #, c-format @@ -3351,21 +3469,29 @@ msgid "" "Can't select installed nor candidate version from package '%s' as it has " "neither of them" msgstr "" +"Kan noch de geïnstalleerde, noch de kandidaat-versie van het pakket '%s' " +"selecteren omdat deze geen van beide heeft" #: apt-pkg/cacheset.cc:491 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" +"Kan de nieuwste versie van het pakket '%s' niet selecteren omdat deze zuiver " +"virtueel is" #: apt-pkg/cacheset.cc:499 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" +"Kan de kandidaat-versie van het pakket %s niet selecteren omdat deze geen " +"kandidaat heeft" #: apt-pkg/cacheset.cc:507 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" +"Kan de geïnstalleerde versie van het pakket %s niet selecteren omdat deze " +"niet geïnstalleerd is" #: apt-pkg/deb/dpkgpm.cc:54 #, c-format @@ -3390,7 +3516,7 @@ msgstr "%s wordt volledig verwijderd" #: apt-pkg/deb/dpkgpm.cc:58 #, c-format msgid "Noting disappearance of %s" -msgstr "" +msgstr "De verdwijning van %s wordt opgemerkt" #: apt-pkg/deb/dpkgpm.cc:59 #, c-format @@ -3404,9 +3530,9 @@ msgid "Directory '%s' missing" msgstr "Map '%s' ontbreekt" #: apt-pkg/deb/dpkgpm.cc:669 apt-pkg/deb/dpkgpm.cc:689 -#, fuzzy, c-format +#, c-format msgid "Could not open file '%s'" -msgstr "Kon het bestand %s niet openen" +msgstr "Kon het bestand '%s' niet openen" #: apt-pkg/deb/dpkgpm.cc:841 #, c-format @@ -3448,47 +3574,57 @@ msgstr "Volledige verwijdering van %s wordt voorbereid" msgid "Completely removed %s" msgstr "%s is volledig verwijderd" -#: apt-pkg/deb/dpkgpm.cc:1082 +#: apt-pkg/deb/dpkgpm.cc:1087 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" "Kon logbestand niet wegschrijven, openpty() is mislukt (/dev/pts niet " "aangekoppeld?)\n" -#: apt-pkg/deb/dpkgpm.cc:1113 +#: apt-pkg/deb/dpkgpm.cc:1118 msgid "Running dpkg" msgstr "dpkg wordt uitgevoerd" -#: apt-pkg/deb/dpkgpm.cc:1338 +#: apt-pkg/deb/dpkgpm.cc:1344 msgid "No apport report written because MaxReports is reached already" msgstr "" +"Er is geen apport-verslag weggeschreven omdat het maximum aantal verslagen " +"(MaxReports) al is bereikt" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1343 +#: apt-pkg/deb/dpkgpm.cc:1349 msgid "dependency problems - leaving unconfigured" -msgstr "" +msgstr "problemen met vereisten - wordt niet geconfigureerd" -#: apt-pkg/deb/dpkgpm.cc:1345 +#: apt-pkg/deb/dpkgpm.cc:1351 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" +"Er is geen apport-verslag weggeschreven omdat de foutmelding volgt op een " +"eerdere mislukking." -#: apt-pkg/deb/dpkgpm.cc:1351 +#: apt-pkg/deb/dpkgpm.cc:1357 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" +"Er is geen apport-verslag weggeschreven omdat de foutmelding een fout is " +"over een volle schijf." -#: apt-pkg/deb/dpkgpm.cc:1357 +#: apt-pkg/deb/dpkgpm.cc:1363 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" +"Er is geen apport-verslag weggeschreven omdat de foutmelding een fout is " +"over onvoldoende-geheugen." -#: apt-pkg/deb/dpkgpm.cc:1364 +#: apt-pkg/deb/dpkgpm.cc:1370 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" +"Er is geen apport-verslag weggeschreven omdat de foutmelding een fout over " +"dpkg-I/O is." #: apt-pkg/deb/debsystem.cc:69 #, c-format @@ -3507,12 +3643,11 @@ msgstr "Kan de beheersmap (%s) niet vergrendelen. Heeft u beheerdersrechten?" #. TRANSLATORS: the %s contains the recovery command, usually #. dpkg --configure -a #: apt-pkg/deb/debsystem.cc:88 -#, fuzzy, c-format +#, c-format msgid "" "dpkg was interrupted, you must manually run '%s' to correct the problem. " msgstr "" -"dpkg werd onderbroken; voer handmatig 'dpkg --configure -a' uit om het " -"probleem te verhelpen. " +"dpkg werd onderbroken; voer handmatig '%s' uit om het probleem te verhelpen. " #: apt-pkg/deb/debsystem.cc:106 msgid "Not locked" @@ -3523,21 +3658,22 @@ msgstr "Niet vergrendeld" #: methods/mirror.cc:260 #, c-format msgid "No mirror file '%s' found " -msgstr "" +msgstr "Geen spiegelbestand '%s' gevonden " #. FIXME: fallback to a default mirror here instead #. and provide a config option to define that default #: methods/mirror.cc:267 #, fuzzy, c-format +#| msgid "No mirror file '%s' found " msgid "Can not read mirror file '%s'" -msgstr "Kon het bestand %s niet openen" +msgstr "Geen spiegelbestand '%s' gevonden " #: methods/mirror.cc:422 #, c-format msgid "[Mirror: %s]" -msgstr "" +msgstr "[Spiegelserver: %s]" -#: methods/rred.cc:503 +#: methods/rred.cc:506 #, c-format msgid "" "Could not patch %s with mmap and with file operation usage - the patch seems " @@ -3546,7 +3682,7 @@ msgstr "" "Kon %s niet patchen met mmap of met een bestandsoperatie - de patch lijkt " "beschadigd te zijn." -#: methods/rred.cc:508 +#: methods/rred.cc:511 #, c-format msgid "" "Could not patch %s with mmap (but no mmap specific fail) - the patch seems " @@ -3562,24 +3698,8 @@ msgstr "Verbinding werd voortijdig afgebroken" #~ msgid "Internal error, could not locate member" #~ msgstr "Interne fout, kon onderdeel niet vinden" -#~ msgid "E: Too many keyrings should be passed to gpgv. Exiting." -#~ msgstr "" -#~ "E: Te veel sleutelringen om door te geven aan gpgv. Er wordt afgesloten." - -#~ msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." -#~ msgstr "" -#~ "F: argumentenlijst van Acquire::gpv::Options was te lang. Er wordt " -#~ "afgesloten." - -#~ msgid "" -#~ "The size of a MMap has already reached the defined limit of %lu bytes," -#~ "abort the try to grow the MMap." -#~ msgstr "" -#~ "De omvang van een MMap heeft de gedefinieerde limiet van %lu bytes al " -#~ "bereikt; de MMap wordt niet verder vergroot." - -#~ msgid "Error occurred while processing %s (NewVersion2)" -#~ msgstr "Fout tijdens verwerken van %s (NewVersion2)" +#~ msgid "Internal error, group '%s' has no installable pseudo package" +#~ msgstr "Interne fout, de groep '%s' heeft geen installeerbaar pseudopakket" -#~ msgid "Malformed line %u in source list %s (vendor id)" -#~ msgstr "Misvormde regel %u in bronlijst %s (verkopers-ID)" +#~ msgid "Release file expired, ignoring %s (invalid since %s)" +#~ msgstr "Release-bestand is verlopen, %s (ongeldig sinds %s) wordt genegeerd" -- cgit v1.2.3-70-g09d2 From 561f860a385087ea4d863f01cb5e0e050a5e360f Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Thu, 15 Dec 2011 23:38:38 +0100 Subject: refactor compressor calling so that we don't (need to) export ExecCompressor anymore and therefore are also able to drop quiet a bit of duplicated code --- apt-pkg/contrib/fileutl.cc | 376 +++++++++++++++------------------------------ apt-pkg/contrib/fileutl.h | 8 - 2 files changed, 120 insertions(+), 264 deletions(-) diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index 60396fc3d..44486905f 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -51,7 +51,7 @@ #if APT_USE_ZLIB #include <zlib.h> #else -#warning "Usage of zlib is DISABLED!" +#pragma message "Usage of zlib is DISABLED!" #endif #ifdef WORDS_BIGENDIAN @@ -70,11 +70,12 @@ class FileFdPrivate { #else void* gz; #endif + int compressed_fd; pid_t compressor_pid; bool pipe; APT::Configuration::Compressor compressor; unsigned int openmode; - FileFdPrivate() : gz(NULL), compressor_pid(-1), pipe(false) {}; + FileFdPrivate() : gz(NULL), compressed_fd(-1), compressor_pid(-1), pipe(false) {}; }; // RunScripts - Run a set of scripts from a configuration subtree /*{{{*/ @@ -740,187 +741,6 @@ bool ExecWait(pid_t Pid,const char *Name,bool Reap) } /*}}}*/ -// ExecCompressor - Open a de/compressor pipe /*{{{*/ -// --------------------------------------------------------------------- -/* This opens the compressor, either in compress mode or decompress - mode. FileFd is always the compressor input/output file, - OutFd is the created pipe, Input for Compress, Output for Decompress. */ -bool ExecCompressor(APT::Configuration::Compressor const &Prog, - pid_t *Pid, int const FileFd, int &OutFd, bool const Comp) -{ - if (Pid != NULL) - *Pid = -1; - - // No compression - if (Prog.Binary.empty() == true) - { - OutFd = dup(FileFd); - return true; - } - - // Handle 'decompression' of empty files - if (Comp == false) - { - struct stat Buf; - fstat(FileFd, &Buf); - if (Buf.st_size == 0 && S_ISFIFO(Buf.st_mode) == false) - { - OutFd = FileFd; - return true; - } - } - - // Create a data pipe - int Pipe[2] = {-1,-1}; - if (pipe(Pipe) != 0) - return _error->Errno("pipe",_("Failed to create subprocess IPC")); - for (int J = 0; J != 2; J++) - SetCloseExec(Pipe[J],true); - - if (Comp == true) - OutFd = Pipe[1]; - else - OutFd = Pipe[0]; - - // The child.. - pid_t child = ExecFork(); - if (Pid != NULL) - *Pid = child; - if (child == 0) - { - if (Comp == true) - { - dup2(FileFd,STDOUT_FILENO); - dup2(Pipe[0],STDIN_FILENO); - } - else - { - dup2(FileFd,STDIN_FILENO); - dup2(Pipe[1],STDOUT_FILENO); - } - - SetCloseExec(STDOUT_FILENO,false); - SetCloseExec(STDIN_FILENO,false); - - std::vector<char const*> Args; - Args.push_back(Prog.Binary.c_str()); - std::vector<std::string> const * const addArgs = - (Comp == true) ? &(Prog.CompressArgs) : &(Prog.UncompressArgs); - for (std::vector<std::string>::const_iterator a = addArgs->begin(); - a != addArgs->end(); ++a) - Args.push_back(a->c_str()); - Args.push_back(NULL); - - execvp(Args[0],(char **)&Args[0]); - cerr << _("Failed to exec compressor ") << Args[0] << endl; - _exit(100); - } - if (Comp == true) - close(Pipe[0]); - else - close(Pipe[1]); - - if (Pid == NULL) - ExecWait(child, Prog.Binary.c_str(), true); - - return true; -} -bool ExecCompressor(APT::Configuration::Compressor const &Prog, - pid_t *Pid, std::string const &FileName, int &OutFd, bool const Comp) -{ - if (Pid != NULL) - *Pid = -1; - - // No compression - if (Prog.Binary.empty() == true) - { - if (Comp == true) - OutFd = open(FileName.c_str(), O_WRONLY, 0666); - else - OutFd = open(FileName.c_str(), O_RDONLY); - return true; - } - - // Handle 'decompression' of empty files - if (Comp == false) - { - struct stat Buf; - stat(FileName.c_str(), &Buf); - if (Buf.st_size == 0) - { - OutFd = open(FileName.c_str(), O_RDONLY); - return true; - } - } - - // Create a data pipe - int Pipe[2] = {-1,-1}; - if (pipe(Pipe) != 0) - return _error->Errno("pipe",_("Failed to create subprocess IPC")); - for (int J = 0; J != 2; J++) - SetCloseExec(Pipe[J],true); - - int FileFd = -1; - if (Comp == true) - { - OutFd = Pipe[1]; - // FIXME: we should handle openmode and permission from Open() here - FileFd = open(FileName.c_str(), O_WRONLY, 0666); - } - else - OutFd = Pipe[0]; - - // The child.. - pid_t child = ExecFork(); - if (Pid != NULL) - *Pid = child; - if (child == 0) - { - if (Comp == true) - { - dup2(Pipe[0],STDIN_FILENO); - dup2(FileFd,STDOUT_FILENO); - SetCloseExec(STDIN_FILENO,false); - } - else - { - dup2(Pipe[1],STDOUT_FILENO); - } - SetCloseExec(STDOUT_FILENO,false); - - std::vector<char const*> Args; - Args.push_back(Prog.Binary.c_str()); - std::vector<std::string> const * const addArgs = - (Comp == true) ? &(Prog.CompressArgs) : &(Prog.UncompressArgs); - for (std::vector<std::string>::const_iterator a = addArgs->begin(); - a != addArgs->end(); ++a) - Args.push_back(a->c_str()); - if (Comp == false) - { - Args.push_back("--stdout"); - Args.push_back(FileName.c_str()); - } - Args.push_back(NULL); - - execvp(Args[0],(char **)&Args[0]); - cerr << _("Failed to exec compressor ") << Args[0] << endl; - _exit(100); - } - if (Comp == true) - { - close(Pipe[0]); - close(FileFd); - } - else - close(Pipe[1]); - - if (Pid == NULL) - ExecWait(child, Prog.Binary.c_str(), false); - - return true; -} - /*}}}*/ - // FileFd::Open - Open a file /*{{{*/ // --------------------------------------------------------------------- /* The most commonly used open mode combinations are given with Mode */ @@ -1028,80 +848,33 @@ bool FileFd::Open(string FileName,unsigned int const Mode,APT::Configuration::Co unlink(FileName.c_str()); } - // if we have them, use inbuilt compressors instead of forking - if (compressor.Name != "." -#if APT_USE_ZLIB - && compressor.Name != "gzip" -#endif - ) - { - if ((Mode & ReadWrite) == ReadWrite) - return _error->Error("External compressors like %s do not support readwrite mode for file %s", compressor.Name.c_str(), FileName.c_str()); + int fileflags = 0; + #define if_FLAGGED_SET(FLAG, MODE) if ((Mode & FLAG) == FLAG) fileflags |= MODE + if_FLAGGED_SET(ReadWrite, O_RDWR); + else if_FLAGGED_SET(ReadOnly, O_RDONLY); + else if_FLAGGED_SET(WriteOnly, O_WRONLY); - if ((Mode & (WriteOnly | Create)) == (WriteOnly | Create)) - { - if (TemporaryFileName.empty() == false) - { - if (RealFileExists(TemporaryFileName) == false) - { - iFd = open(TemporaryFileName.c_str(), O_WRONLY | O_CREAT, Perms); - close(iFd); - iFd = -1; - } - } - else if (RealFileExists(FileName) == false) - { - iFd = open(FileName.c_str(), O_WRONLY | O_CREAT, Perms); - close(iFd); - iFd = -1; - } - } + if_FLAGGED_SET(Create, O_CREAT); + if_FLAGGED_SET(Empty, O_TRUNC); + if_FLAGGED_SET(Exclusive, O_EXCL); + else if_FLAGGED_SET(Atomic, O_EXCL); + #undef if_FLAGGED_SET - if (TemporaryFileName.empty() == false) - { - if (ExecCompressor(compressor, &(d->compressor_pid), TemporaryFileName, iFd, ((Mode & ReadOnly) != ReadOnly)) == false) - return _error->Error("Forking external compressor %s is not implemented for %s", compressor.Name.c_str(), TemporaryFileName.c_str()); - } - else - { - if (ExecCompressor(compressor, &(d->compressor_pid), FileName, iFd, ((Mode & ReadOnly) != ReadOnly)) == false) - return _error->Error("Forking external compressor %s is not implemented for %s", compressor.Name.c_str(), FileName.c_str()); - } - d->pipe = true; - d->compressor = compressor; - } + if (TemporaryFileName.empty() == false) + iFd = open(TemporaryFileName.c_str(), fileflags, Perms); else - { - int fileflags = 0; - #define if_FLAGGED_SET(FLAG, MODE) if ((Mode & FLAG) == FLAG) fileflags |= MODE - if_FLAGGED_SET(ReadWrite, O_RDWR); - else if_FLAGGED_SET(ReadOnly, O_RDONLY); - else if_FLAGGED_SET(WriteOnly, O_WRONLY); - - if_FLAGGED_SET(Create, O_CREAT); - if_FLAGGED_SET(Exclusive, O_EXCL); - else if_FLAGGED_SET(Atomic, O_EXCL); - if_FLAGGED_SET(Empty, O_TRUNC); - #undef if_FLAGGED_SET - - if (TemporaryFileName.empty() == false) - iFd = open(TemporaryFileName.c_str(), fileflags, Perms); - else - iFd = open(FileName.c_str(), fileflags, Perms); + iFd = open(FileName.c_str(), fileflags, Perms); + if (iFd == -1 || OpenInternDescriptor(Mode, compressor) == false) + { if (iFd != -1) { - if (OpenInternDescriptor(Mode, compressor) == false) - { - close (iFd); - iFd = -1; - } + close (iFd); + iFd = -1; } + return _error->Errno("open",_("Could not open file %s"), FileName.c_str()); } - if (iFd == -1) - return _error->Errno("open",_("Could not open file %s"),FileName.c_str()); - this->FileName = FileName; SetCloseExec(iFd,true); return true; @@ -1152,7 +925,8 @@ bool FileFd::OpenDescriptor(int Fd, unsigned int const Mode, APT::Configuration: } bool FileFd::OpenInternDescriptor(unsigned int const Mode, APT::Configuration::Compressor const &compressor) { - if (compressor.Name == ".") + d->compressor = compressor; + if (compressor.Name == "." || compressor.Binary.empty() == true) return true; #if APT_USE_ZLIB else if (compressor.Name == "gzip") @@ -1166,10 +940,90 @@ bool FileFd::OpenInternDescriptor(unsigned int const Mode, APT::Configuration::C if (d->gz == NULL) return false; Flags |= Compressed; + return true; } #endif + + if ((Mode & ReadWrite) == ReadWrite) + return _error->Error("ReadWrite mode is not supported for file %s", FileName.c_str()); + + bool const Comp = (Mode & WriteOnly) == WriteOnly; + // Handle 'decompression' of empty files + if (Comp == false) + { + struct stat Buf; + fstat(iFd, &Buf); + if (Buf.st_size == 0 && S_ISFIFO(Buf.st_mode) == false) + return true; + + // We don't need the file open - instead let the compressor open it + // as he properly knows better how to efficiently read from 'his' file + if (FileName.empty() == false) + close(iFd); + } + + // Create a data pipe + int Pipe[2] = {-1,-1}; + if (pipe(Pipe) != 0) + return _error->Errno("pipe",_("Failed to create subprocess IPC")); + for (int J = 0; J != 2; J++) + SetCloseExec(Pipe[J],true); + + d->compressed_fd = iFd; + d->pipe = true; + + if (Comp == true) + iFd = Pipe[1]; + else + iFd = Pipe[0]; + + // The child.. + d->compressor_pid = ExecFork(); + if (d->compressor_pid == 0) + { + if (Comp == true) + { + dup2(d->compressed_fd,STDOUT_FILENO); + dup2(Pipe[0],STDIN_FILENO); + } + else + { + if (FileName.empty() == true) + dup2(d->compressed_fd,STDIN_FILENO); + dup2(Pipe[1],STDOUT_FILENO); + } + + SetCloseExec(STDOUT_FILENO,false); + SetCloseExec(STDIN_FILENO,false); + + std::vector<char const*> Args; + Args.push_back(compressor.Binary.c_str()); + std::vector<std::string> const * const addArgs = + (Comp == true) ? &(compressor.CompressArgs) : &(compressor.UncompressArgs); + for (std::vector<std::string>::const_iterator a = addArgs->begin(); + a != addArgs->end(); ++a) + Args.push_back(a->c_str()); + if (Comp == false && FileName.empty() == false) + { + Args.push_back("--stdout"); + if (TemporaryFileName.empty() == false) + Args.push_back(TemporaryFileName.c_str()); + else + Args.push_back(FileName.c_str()); + } + Args.push_back(NULL); + + execvp(Args[0],(char **)&Args[0]); + cerr << _("Failed to exec compressor ") << Args[0] << endl; + _exit(100); + } + if (Comp == true) + close(Pipe[0]); else - return _error->Error("Can't find a match for specified compressor %s for file %s", compressor.Name.c_str(), FileName.c_str()); + close(Pipe[1]); + if (Comp == true || FileName.empty() == true) + close(d->compressed_fd); + return true; } /*}}}*/ @@ -1297,12 +1151,22 @@ bool FileFd::Seek(unsigned long long To) { if (d->pipe == true) { - // FIXME: What about OpenDescriptor() stuff here? + if ((d->openmode & ReadOnly) != ReadOnly) + return _error->Error("Reopen is only implemented for read-only files!"); close(iFd); - bool result = ExecCompressor(d->compressor, NULL, FileName, iFd, (d->openmode & ReadOnly) != ReadOnly); - if (result == true && To != 0) - result &= Skip(To); - return result; + if (TemporaryFileName.empty() == false) + iFd = open(TemporaryFileName.c_str(), O_RDONLY); + else if (FileName.empty() == false) + iFd = open(FileName.c_str(), O_RDONLY); + else + return _error->Error("Reopen is not implemented for OpenDescriptor()-FileFd!"); + + if (OpenInternDescriptor(d->openmode, d->compressor) == false) + return _error->Error("Seek on file %s because it couldn't be reopened", FileName.c_str()); + + if (To != 0) + return Skip(To); + return true; } int res; #if APT_USE_ZLIB @@ -1521,7 +1385,7 @@ bool FileFd::Close() if (d != NULL) { - if (d->compressor_pid != -1) + if (d->compressor_pid > 0) ExecWait(d->compressor_pid, "FileFdCompressor", true); delete d; d = NULL; diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h index f14f97b69..147535df1 100644 --- a/apt-pkg/contrib/fileutl.h +++ b/apt-pkg/contrib/fileutl.h @@ -178,14 +178,6 @@ bool WaitFd(int Fd,bool write = false,unsigned long timeout = 0); pid_t ExecFork(); bool ExecWait(pid_t Pid,const char *Name,bool Reap = false); -bool ExecCompressor(APT::Configuration::Compressor const &Prog, - pid_t *Pid, int const FileFd, int &OutFd, bool const Comp = true); -inline bool ExecDecompressor(APT::Configuration::Compressor const &Prog, - pid_t *Pid, int const FileFd, int &OutFd) -{ - return ExecCompressor(Prog, Pid, FileFd, OutFd, true); -} - // File string manipulators std::string flNotDir(std::string File); std::string flNotFile(std::string File); -- cgit v1.2.3-70-g09d2 From 6fd947bd48449652edf783cfb1362391e63f9be1 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Fri, 16 Dec 2011 00:04:52 +0100 Subject: try seeking on fds opened with OpenDescriptor before giving up --- apt-pkg/contrib/fileutl.cc | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index 44486905f..a98c2cb85 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -1154,12 +1154,19 @@ bool FileFd::Seek(unsigned long long To) if ((d->openmode & ReadOnly) != ReadOnly) return _error->Error("Reopen is only implemented for read-only files!"); close(iFd); + iFd = 0; if (TemporaryFileName.empty() == false) iFd = open(TemporaryFileName.c_str(), O_RDONLY); else if (FileName.empty() == false) iFd = open(FileName.c_str(), O_RDONLY); else - return _error->Error("Reopen is not implemented for OpenDescriptor()-FileFd!"); + { + if (d->compressed_fd > 0) + if (lseek(d->compressed_fd, 0, SEEK_SET) != 0) + iFd = d->compressed_fd; + if (iFd <= 0) + return _error->Error("Reopen is not implemented for pipes opened with FileFd::OpenDescriptor()!"); + } if (OpenInternDescriptor(d->openmode, d->compressor) == false) return _error->Error("Seek on file %s because it couldn't be reopened", FileName.c_str()); -- cgit v1.2.3-70-g09d2 From 1abbc47c045770476f5f9a57c58989d13290d51b Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sat, 17 Dec 2011 17:31:47 +0100 Subject: keep track of where we are in a filedescriptor so we can use it as Tell() information if we are working on a pipe which can't seek --- apt-pkg/contrib/fileutl.cc | 39 ++++++++++++++++++++++++++++++--------- 1 file changed, 30 insertions(+), 9 deletions(-) diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index a98c2cb85..bb836e93b 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -75,7 +75,9 @@ class FileFdPrivate { bool pipe; APT::Configuration::Compressor compressor; unsigned int openmode; - FileFdPrivate() : gz(NULL), compressed_fd(-1), compressor_pid(-1), pipe(false) {}; + unsigned long long seekpos; + FileFdPrivate() : gz(NULL), compressed_fd(-1), compressor_pid(-1), pipe(false), + openmode(0), seekpos(0) {}; }; // RunScripts - Run a set of scripts from a configuration subtree /*{{{*/ @@ -1065,6 +1067,7 @@ bool FileFd::Read(void *To,unsigned long long Size,unsigned long long *Actual) To = (char *)To + Res; Size -= Res; + d->seekpos += Res; if (Actual != 0) *Actual += Res; } @@ -1134,6 +1137,7 @@ bool FileFd::Write(const void *From,unsigned long long Size) From = (char *)From + Res; Size -= Res; + d->seekpos += Res; } while (Res > 0 && Size > 0); @@ -1151,6 +1155,13 @@ bool FileFd::Seek(unsigned long long To) { if (d->pipe == true) { + // Our poor man seeking in pipes is costly, so try to avoid it + unsigned long long seekpos = Tell(); + if (seekpos == To) + return true; + else if (seekpos < To) + return Skip(To - seekpos); + if ((d->openmode & ReadOnly) != ReadOnly) return _error->Error("Reopen is only implemented for read-only files!"); close(iFd); @@ -1173,6 +1184,8 @@ bool FileFd::Seek(unsigned long long To) if (To != 0) return Skip(To); + + d->seekpos = To; return true; } int res; @@ -1187,7 +1200,8 @@ bool FileFd::Seek(unsigned long long To) Flags |= Fail; return _error->Error("Unable to seek to %llu", To); } - + + d->seekpos = To; return true; } /*}}}*/ @@ -1208,7 +1222,8 @@ bool FileFd::Skip(unsigned long long Over) Flags |= Fail; return _error->Error("Unable to seek ahead %llu",Over); } - + d->seekpos = res; + return true; } /*}}}*/ @@ -1236,6 +1251,13 @@ bool FileFd::Truncate(unsigned long long To) /* */ unsigned long long FileFd::Tell() { + // In theory, we could just return seekpos here always instead of + // seeking around, but not all users of FileFd use always Seek() and co + // so d->seekpos isn't always true and we can just use it as a hint if + // we have nothing else, but not always as an authority… + if (d->pipe == true) + return d->seekpos; + off_t Res; #if APT_USE_ZLIB if (d->gz != NULL) @@ -1245,6 +1267,7 @@ unsigned long long FileFd::Tell() Res = lseek(iFd,0,SEEK_CUR); if (Res == (off_t)-1) _error->Errno("lseek","Failed to determine the current file position"); + d->seekpos = Res; return Res; } /*}}}*/ @@ -1281,15 +1304,14 @@ unsigned long long FileFd::Size() // so we 'read' the content and 'seek' back - see there if (d->pipe == true) { - // FIXME: If we have read first and then FileSize() the report is wrong - size = 0; + unsigned long long const oldSeek = Tell(); char ignore[1000]; unsigned long long read = 0; do { Read(ignore, sizeof(ignore), &read); - size += read; } while(read != 0); - Seek(0); + size = Tell(); + Seek(oldSeek); } #if APT_USE_ZLIB // only check gzsize if we are actually a gzip file, just checking for @@ -1301,7 +1323,6 @@ unsigned long long FileFd::Size() * this ourselves; the original (uncompressed) file size is the last 32 * bits of the file */ // FIXME: Size for gz-files is limited by 32bit… no largefile support - off_t orig_pos = lseek(iFd, 0, SEEK_CUR); if (lseek(iFd, -4, SEEK_END) < 0) return _error->Errno("lseek","Unable to seek to end of gzipped file"); size = 0L; @@ -1315,7 +1336,7 @@ unsigned long long FileFd::Size() size = tmp_size; #endif - if (lseek(iFd, orig_pos, SEEK_SET) < 0) + if (lseek(iFd, d->seekpos, SEEK_SET) < 0) return _error->Errno("lseek","Unable to seek in gzipped file"); return size; } -- cgit v1.2.3-70-g09d2 From 109eb1511d0cdfa4af3196105cada30bcbb77bc8 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sat, 17 Dec 2011 23:53:31 +0100 Subject: try to avoid direct usage of .Fd() if possible and do read()s and co on the FileFd instead --- apt-pkg/acquire-item.cc | 4 ++-- apt-pkg/contrib/hashes.cc | 40 +++++++++++++++++++++++++++++++++----- apt-pkg/contrib/hashes.h | 5 +++++ apt-pkg/contrib/hashsum.cc | 22 +++++++++++++++++++++ apt-pkg/contrib/hashsum_template.h | 3 +++ apt-pkg/deb/debindexfile.cc | 3 --- ftparchive/cachedb.cc | 8 ++++---- ftparchive/writer.cc | 2 +- methods/cdrom.cc | 2 +- methods/copy.cc | 2 +- methods/file.cc | 2 +- methods/ftp.cc | 2 +- methods/http.cc | 24 +++++++---------------- methods/https.cc | 2 +- methods/rsh.cc | 2 +- 15 files changed, 85 insertions(+), 38 deletions(-) diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index 453fce109..f231c42b4 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -438,7 +438,7 @@ bool pkgAcqDiffIndex::ParseDiffIndex(string IndexDiffFile) /*{{{*/ FileFd fd(CurrentPackagesFile, FileFd::ReadOnly); SHA1Summation SHA1; - SHA1.AddFD(fd.Fd(), fd.Size()); + SHA1.AddFD(fd); string const local_sha1 = SHA1.Result(); if(local_sha1 == ServerSha1) @@ -669,7 +669,7 @@ bool pkgAcqIndexDiffs::QueueNextDiff() /*{{{*/ FileFd fd(FinalFile, FileFd::ReadOnly); SHA1Summation SHA1; - SHA1.AddFD(fd.Fd(), fd.Size()); + SHA1.AddFD(fd); string local_sha1 = string(SHA1.Result()); if(Debug) std::clog << "QueueNextDiff: " diff --git a/apt-pkg/contrib/hashes.cc b/apt-pkg/contrib/hashes.cc index 05001f042..e1a431823 100644 --- a/apt-pkg/contrib/hashes.cc +++ b/apt-pkg/contrib/hashes.cc @@ -61,25 +61,25 @@ bool HashString::VerifyFile(std::string filename) const /*{{{*/ if(Type == "MD5Sum") { MD5Summation MD5; - MD5.AddFD(Fd.Fd(), Fd.Size()); + MD5.AddFD(Fd); fileHash = (std::string)MD5.Result(); } else if (Type == "SHA1") { SHA1Summation SHA1; - SHA1.AddFD(Fd.Fd(), Fd.Size()); + SHA1.AddFD(Fd); fileHash = (std::string)SHA1.Result(); } else if (Type == "SHA256") { SHA256Summation SHA256; - SHA256.AddFD(Fd.Fd(), Fd.Size()); + SHA256.AddFD(Fd); fileHash = (std::string)SHA256.Result(); } else if (Type == "SHA512") { SHA512Summation SHA512; - SHA512.AddFD(Fd.Fd(), Fd.Size()); + SHA512.AddFD(Fd); fileHash = (std::string)SHA512.Result(); } Fd.Close(); @@ -134,6 +134,36 @@ bool Hashes::AddFD(int const Fd,unsigned long long Size, bool const addMD5, SHA512.Add(Buf,Res); } return true; +} +bool Hashes::AddFD(FileFd &Fd,unsigned long long Size, bool const addMD5, + bool const addSHA1, bool const addSHA256, bool const addSHA512) +{ + unsigned char Buf[64*64]; + bool const ToEOF = (Size == 0); + while (Size != 0 || ToEOF) + { + unsigned long long n = sizeof(Buf); + if (!ToEOF) n = std::min(Size, n); + unsigned long long a = 0; + if (Fd.Read(Buf, n, &a) == false) // error + return false; + if (ToEOF == false) + { + if (a != n) // short read + return false; + } + else if (a == 0) // EOF + break; + Size -= a; + if (addMD5 == true) + MD5.Add(Buf, a); + if (addSHA1 == true) + SHA1.Add(Buf, a); + if (addSHA256 == true) + SHA256.Add(Buf, a); + if (addSHA512 == true) + SHA512.Add(Buf, a); + } + return true; } /*}}}*/ - diff --git a/apt-pkg/contrib/hashes.h b/apt-pkg/contrib/hashes.h index b206eccb8..0c0b6c6a7 100644 --- a/apt-pkg/contrib/hashes.h +++ b/apt-pkg/contrib/hashes.h @@ -17,6 +17,7 @@ #include <apt-pkg/md5.h> #include <apt-pkg/sha1.h> #include <apt-pkg/sha2.h> +#include <apt-pkg/fileutl.h> #include <algorithm> #include <vector> @@ -74,6 +75,10 @@ class Hashes { return AddFD(Fd, Size, true, true, true, true); }; bool AddFD(int const Fd, unsigned long long Size, bool const addMD5, bool const addSHA1, bool const addSHA256, bool const addSHA512); + inline bool AddFD(FileFd &Fd,unsigned long long Size = 0) + { return AddFD(Fd, Size, true, true, true, true); }; + bool AddFD(FileFd &Fd, unsigned long long Size, bool const addMD5, + bool const addSHA1, bool const addSHA256, bool const addSHA512); inline bool Add(const unsigned char *Beg,const unsigned char *End) {return Add(Beg,End-Beg);}; }; diff --git a/apt-pkg/contrib/hashsum.cc b/apt-pkg/contrib/hashsum.cc index ff3b112bb..289e43aa4 100644 --- a/apt-pkg/contrib/hashsum.cc +++ b/apt-pkg/contrib/hashsum.cc @@ -24,5 +24,27 @@ bool SummationImplementation::AddFD(int const Fd, unsigned long long Size) { Add(Buf,Res); } return true; +} +bool SummationImplementation::AddFD(FileFd &Fd, unsigned long long Size) { + unsigned char Buf[64 * 64]; + bool ToEOF = (Size == 0); + while (Size != 0 || ToEOF) + { + unsigned long long n = sizeof(Buf); + if (!ToEOF) n = std::min(Size, n); + unsigned long long a = 0; + if (Fd.Read(Buf, n, &a) == false) // error + return false; + if (ToEOF == false) + { + if (a != n) // short read + return false; + } + else if (a == 0) // EOF + break; + Size -= a; + Add(Buf, a); + } + return true; } /*}}}*/ diff --git a/apt-pkg/contrib/hashsum_template.h b/apt-pkg/contrib/hashsum_template.h index 6301ac9d0..51e3b0862 100644 --- a/apt-pkg/contrib/hashsum_template.h +++ b/apt-pkg/contrib/hashsum_template.h @@ -10,6 +10,8 @@ #ifndef APTPKG_HASHSUM_TEMPLATE_H #define APTPKG_HASHSUM_TEMPLATE_H +#include <apt-pkg/fileutl.h> + #include <string> #include <cstring> #include <algorithm> @@ -108,6 +110,7 @@ class SummationImplementation { return Add((const unsigned char *)Beg, End - Beg); }; bool AddFD(int Fd, unsigned long long Size = 0); + bool AddFD(FileFd &Fd, unsigned long long Size = 0); }; #endif diff --git a/apt-pkg/deb/debindexfile.cc b/apt-pkg/deb/debindexfile.cc index 84791a70a..5dc2a2ac2 100644 --- a/apt-pkg/deb/debindexfile.cc +++ b/apt-pkg/deb/debindexfile.cc @@ -600,9 +600,6 @@ bool debStatusIndex::Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const // Store the IMS information pkgCache::PkgFileIterator CFile = Gen.GetCurFile(); - struct stat St; - if (fstat(Pkg.Fd(),&St) != 0) - return _error->Errno("fstat","Failed to stat"); CFile->Size = Pkg.FileSize(); CFile->mtime = Pkg.ModificationTime(); CFile->Archive = Gen.WriteUniqString("now"); diff --git a/ftparchive/cachedb.cc b/ftparchive/cachedb.cc index f0bfa2a6d..a8b637a80 100644 --- a/ftparchive/cachedb.cc +++ b/ftparchive/cachedb.cc @@ -351,7 +351,7 @@ bool CacheDB::GetMD5(bool const &GenOnly) return false; } MD5Summation MD5; - if (Fd->Seek(0) == false || MD5.AddFD(Fd->Fd(),CurStat.FileSize) == false) + if (Fd->Seek(0) == false || MD5.AddFD(*Fd, CurStat.FileSize) == false) return false; MD5Res = MD5.Result(); @@ -382,7 +382,7 @@ bool CacheDB::GetSHA1(bool const &GenOnly) return false; } SHA1Summation SHA1; - if (Fd->Seek(0) == false || SHA1.AddFD(Fd->Fd(),CurStat.FileSize) == false) + if (Fd->Seek(0) == false || SHA1.AddFD(*Fd, CurStat.FileSize) == false) return false; SHA1Res = SHA1.Result(); @@ -413,7 +413,7 @@ bool CacheDB::GetSHA256(bool const &GenOnly) return false; } SHA256Summation SHA256; - if (Fd->Seek(0) == false || SHA256.AddFD(Fd->Fd(),CurStat.FileSize) == false) + if (Fd->Seek(0) == false || SHA256.AddFD(*Fd, CurStat.FileSize) == false) return false; SHA256Res = SHA256.Result(); @@ -444,7 +444,7 @@ bool CacheDB::GetSHA512(bool const &GenOnly) return false; } SHA512Summation SHA512; - if (Fd->Seek(0) == false || SHA512.AddFD(Fd->Fd(),CurStat.FileSize) == false) + if (Fd->Seek(0) == false || SHA512.AddFD(*Fd, CurStat.FileSize) == false) return false; SHA512Res = SHA512.Result(); diff --git a/ftparchive/writer.cc b/ftparchive/writer.cc index 02777713c..159772991 100644 --- a/ftparchive/writer.cc +++ b/ftparchive/writer.cc @@ -1035,7 +1035,7 @@ bool ReleaseWriter::DoPackage(string FileName) CheckSums[NewFileName].size = fd.Size(); Hashes hs; - hs.AddFD(fd.Fd(), 0, DoMD5, DoSHA1, DoSHA256, DoSHA512); + hs.AddFD(fd, 0, DoMD5, DoSHA1, DoSHA256, DoSHA512); if (DoMD5 == true) CheckSums[NewFileName].MD5 = hs.MD5.Result(); if (DoSHA1 == true) diff --git a/methods/cdrom.cc b/methods/cdrom.cc index e7114b168..22d4b9164 100644 --- a/methods/cdrom.cc +++ b/methods/cdrom.cc @@ -268,7 +268,7 @@ bool CDROMMethod::Fetch(FetchItem *Itm) Hashes Hash; FileFd Fd(Res.Filename, FileFd::ReadOnly); - Hash.AddFD(Fd.Fd(), Fd.Size()); + Hash.AddFD(Fd); Res.TakeHashes(Hash); URIDone(Res); diff --git a/methods/copy.cc b/methods/copy.cc index f8d58e479..e81d0022b 100644 --- a/methods/copy.cc +++ b/methods/copy.cc @@ -85,7 +85,7 @@ bool CopyMethod::Fetch(FetchItem *Itm) Hashes Hash; FileFd Fd(Res.Filename, FileFd::ReadOnly); - Hash.AddFD(Fd.Fd(), Fd.Size()); + Hash.AddFD(Fd); Res.TakeHashes(Hash); URIDone(Res); diff --git a/methods/file.cc b/methods/file.cc index 5025c996d..7ed4e6f60 100644 --- a/methods/file.cc +++ b/methods/file.cc @@ -83,7 +83,7 @@ bool FileMethod::Fetch(FetchItem *Itm) Hashes Hash; FileFd Fd(Res.Filename, FileFd::ReadOnly); - Hash.AddFD(Fd.Fd(), Fd.Size()); + Hash.AddFD(Fd); Res.TakeHashes(Hash); URIDone(Res); return true; diff --git a/methods/ftp.cc b/methods/ftp.cc index 2ca0ac6f7..ad8a7b828 100644 --- a/methods/ftp.cc +++ b/methods/ftp.cc @@ -868,7 +868,7 @@ bool FTPConn::Get(const char *Path,FileFd &To,unsigned long long Resume, if (Resume != 0) { - if (Hash.AddFD(To.Fd(),Resume) == false) + if (Hash.AddFD(To,Resume) == false) { _error->Errno("read",_("Problem hashing file")); return false; diff --git a/methods/http.cc b/methods/http.cc index 0d81c73ed..b8ed43cd2 100644 --- a/methods/http.cc +++ b/methods/http.cc @@ -1007,31 +1007,21 @@ HttpMethod::DealWithHeaders(FetchResult &Res,ServerState *Srv) FailFile.c_str(); // Make sure we dont do a malloc in the signal handler FailFd = File->Fd(); FailTime = Srv->Date; - - // Set the expected size - if (Srv->StartPos >= 0) - { - Res.ResumePoint = Srv->StartPos; - if (ftruncate(File->Fd(),Srv->StartPos) < 0) - _error->Errno("ftruncate", _("Failed to truncate file")); - } - - // Set the start point - lseek(File->Fd(),0,SEEK_END); delete Srv->In.Hash; Srv->In.Hash = new Hashes; - - // Fill the Hash if the file is non-empty (resume) - if (Srv->StartPos > 0) + + // Set the expected size and read file for the hashes + if (Srv->StartPos >= 0) { - lseek(File->Fd(),0,SEEK_SET); - if (Srv->In.Hash->AddFD(File->Fd(),Srv->StartPos) == false) + Res.ResumePoint = Srv->StartPos; + File->Truncate(Srv->StartPos); + + if (Srv->In.Hash->AddFD(*File,Srv->StartPos) == false) { _error->Errno("read",_("Problem hashing file")); return ERROR_NOT_FROM_SERVER; } - lseek(File->Fd(),0,SEEK_END); } SetNonBlock(File->Fd(),true); diff --git a/methods/https.cc b/methods/https.cc index 335699907..317c8a587 100644 --- a/methods/https.cc +++ b/methods/https.cc @@ -314,7 +314,7 @@ bool HttpsMethod::Fetch(FetchItem *Itm) // take hashes Hashes Hash; FileFd Fd(Res.Filename, FileFd::ReadOnly); - Hash.AddFD(Fd.Fd(), Fd.Size()); + Hash.AddFD(Fd); Res.TakeHashes(Hash); // keep apt updated diff --git a/methods/rsh.cc b/methods/rsh.cc index da9777fc4..d249ae961 100644 --- a/methods/rsh.cc +++ b/methods/rsh.cc @@ -305,7 +305,7 @@ bool RSHConn::Get(const char *Path,FileFd &To,unsigned long long Resume, return false; if (Resume != 0) { - if (Hash.AddFD(To.Fd(),Resume) == false) { + if (Hash.AddFD(To,Resume) == false) { _error->Errno("read",_("Problem hashing file")); return false; } -- cgit v1.2.3-70-g09d2 From 40468850491c4f5bc7060763a6f03cdc570d514e Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sun, 18 Dec 2011 01:21:20 +0100 Subject: usage of Skipping in pipes can't work, so we ignore-read instead Also, read only one char in each step of ReadLine instead of back-"seeking" --- apt-pkg/contrib/fileutl.cc | 34 ++++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index bb836e93b..b350973af 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -1100,15 +1100,19 @@ char* FileFd::ReadLine(char *To, unsigned long long const Size) #endif unsigned long long read = 0; - if (Read(To, Size, &read) == false) + while ((Size - 1) != read) + { + unsigned long long done = 0; + if (Read(To + read, 1, &done) == false) + return NULL; + if (done == 0) + break; + if (To[read++] == '\n') + break; + } + if (read == 0) return NULL; - char* c = To; - for (; *c != '\n' && *c != '\0' && read != 0; --read, ++c) - ; // find the end of the line - if (*c != '\0') - *c = '\0'; - if (read != 0) - Seek(Tell() - read); + To[read] = '\0'; return To; } /*}}}*/ @@ -1210,6 +1214,20 @@ bool FileFd::Seek(unsigned long long To) /* */ bool FileFd::Skip(unsigned long long Over) { + if (d->pipe == true) + { + d->seekpos += Over; + char buffer[1024]; + while (Over != 0) + { + unsigned long long toread = std::min((unsigned long long) sizeof(buffer), Over); + if (Read(buffer, toread) == false) + return _error->Error("Unable to seek ahead %llu",Over); + Over -= toread; + } + return true; + } + int res; #if APT_USE_ZLIB if (d->gz != NULL) -- cgit v1.2.3-70-g09d2 From 29966fd1cc2bab68777e85b9070dba7821a58d36 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sun, 18 Dec 2011 01:22:04 +0100 Subject: implement the fallback method of rred by using the FileFd and the included ReadLine instead of accessing the files directly with fgets() --- methods/rred.cc | 49 ++++++++++++------------------------------------- 1 file changed, 12 insertions(+), 37 deletions(-) diff --git a/methods/rred.cc b/methods/rred.cc index 2a70a9f91..bf9294d96 100644 --- a/methods/rred.cc +++ b/methods/rred.cc @@ -37,13 +37,10 @@ class RredMethod : public pkgAcqMethod { // return values enum State {ED_OK, ED_ORDERING, ED_PARSER, ED_FAILURE, MMAP_FAILED}; - State applyFile(FileFd &ed_cmds, FILE *in_file, FILE *out_file, + State applyFile(FileFd &ed_cmds, FileFd &in_file, FileFd &out_file, unsigned long &line, char *buffer, Hashes *hash) const; - void ignoreLineInFile(FILE *fin, char *buffer) const; void ignoreLineInFile(FileFd &fin, char *buffer) const; - void copyLinesFromFileToFile(FILE *fin, FILE *fout, unsigned int lines, - Hashes *hash, char *buffer) const; - void copyLinesFromFileToFile(FileFd &fin, FILE *fout, unsigned int lines, + void copyLinesFromFileToFile(FileFd &fin, FileFd &fout, unsigned int lines, Hashes *hash, char *buffer) const; State patchFile(FileFd &Patch, FileFd &From, FileFd &out_file, Hashes *hash) const; @@ -72,7 +69,7 @@ public: * \param hash the created file for correctness * \return the success State of the ed command executor */ -RredMethod::State RredMethod::applyFile(FileFd &ed_cmds, FILE *in_file, FILE *out_file, +RredMethod::State RredMethod::applyFile(FileFd &ed_cmds, FileFd &in_file, FileFd &out_file, unsigned long &line, char *buffer, Hashes *hash) const { // get the current command and parse it if (ed_cmds.ReadLine(buffer, BUF_SIZE) == NULL) { @@ -178,39 +175,19 @@ RredMethod::State RredMethod::applyFile(FileFd &ed_cmds, FILE *in_file, FILE *ou return ED_OK; } /*}}}*/ -void RredMethod::copyLinesFromFileToFile(FILE *fin, FILE *fout, unsigned int lines,/*{{{*/ - Hashes *hash, char *buffer) const { - while (0 < lines--) { - do { - fgets(buffer, BUF_SIZE, fin); - size_t const written = fwrite(buffer, 1, strlen(buffer), fout); - hash->Add((unsigned char*)buffer, written); - } while (strlen(buffer) == (BUF_SIZE - 1) && - buffer[BUF_SIZE - 2] != '\n'); - } -} - /*}}}*/ -void RredMethod::copyLinesFromFileToFile(FileFd &fin, FILE *fout, unsigned int lines,/*{{{*/ +void RredMethod::copyLinesFromFileToFile(FileFd &fin, FileFd &fout, unsigned int lines,/*{{{*/ Hashes *hash, char *buffer) const { while (0 < lines--) { do { fin.ReadLine(buffer, BUF_SIZE); - size_t const written = fwrite(buffer, 1, strlen(buffer), fout); - hash->Add((unsigned char*)buffer, written); + unsigned long long const towrite = strlen(buffer); + fout.Write(buffer, towrite); + hash->Add((unsigned char*)buffer, towrite); } while (strlen(buffer) == (BUF_SIZE - 1) && buffer[BUF_SIZE - 2] != '\n'); } } /*}}}*/ -void RredMethod::ignoreLineInFile(FILE *fin, char *buffer) const { /*{{{*/ - fgets(buffer, BUF_SIZE, fin); - while (strlen(buffer) == (BUF_SIZE - 1) && - buffer[BUF_SIZE - 2] != '\n') { - fgets(buffer, BUF_SIZE, fin); - buffer[0] = ' '; - } -} - /*}}}*/ void RredMethod::ignoreLineInFile(FileFd &fin, char *buffer) const { /*{{{*/ fin.ReadLine(buffer, BUF_SIZE); while (strlen(buffer) == (BUF_SIZE - 1) && @@ -223,20 +200,18 @@ void RredMethod::ignoreLineInFile(FileFd &fin, char *buffer) const { /*{{{*/ RredMethod::State RredMethod::patchFile(FileFd &Patch, FileFd &From, /*{{{*/ FileFd &out_file, Hashes *hash) const { char buffer[BUF_SIZE]; - FILE* fFrom = fdopen(From.Fd(), "r"); - FILE* fTo = fdopen(out_file.Fd(), "w"); /* we do a tail recursion to read the commands in the right order */ unsigned long line = -1; // assign highest possible value - State const result = applyFile(Patch, fFrom, fTo, line, buffer, hash); + State const result = applyFile(Patch, From, out_file, line, buffer, hash); /* read the rest from infile */ if (result == ED_OK) { - while (fgets(buffer, BUF_SIZE, fFrom) != NULL) { - size_t const written = fwrite(buffer, 1, strlen(buffer), fTo); - hash->Add((unsigned char*)buffer, written); + while (From.ReadLine(buffer, BUF_SIZE) != NULL) { + unsigned long long const towrite = strlen(buffer); + out_file.Write(buffer, towrite); + hash->Add((unsigned char*)buffer, towrite); } - fflush(fTo); } return result; } -- cgit v1.2.3-70-g09d2 From 14ea309a018d1604db45e29baeeb155cf6401c60 Mon Sep 17 00:00:00 2001 From: Michael Vogt <egon@debian-devbox> Date: Thu, 5 Jan 2012 21:04:08 +0100 Subject: releasing version 0.8.16~exp9 --- debian/changelog | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 06c84f31c..a1b93a981 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -apt (0.8.16~exp9) UNRELEASED; urgency=low +apt (0.8.16~exp9) experimental; urgency=low [ Julian Andres Klode ] * apt-pkg/cdrom.cc: @@ -10,6 +10,7 @@ apt (0.8.16~exp9) UNRELEASED; urgency=low * debian/control: - bump debhelper build-dep to debhelper (>= 8.1.3~) - set libapt-pkg-dev to multi-arch: same too + * g++ 4.7 fixes [ Colin Watson ] * Convert libapt-pkg4.12 and libapt-inst1.4 to Multi-Arch: same. @@ -35,11 +36,8 @@ apt (0.8.16~exp9) UNRELEASED; urgency=low - drop the explicit export of gz-compression handling * apt-pkg/cdrom.cc: - support InRelease files on cdrom - - [ Michael Vogt ] - * g++ 4.7 fixes - -- David Kalnischkies <kalnischkies@gmail.com> Sun, 11 Dec 2011 19:34:58 +0100 + -- Michael Vogt <mvo@debian.org> Thu, 05 Jan 2012 20:26:31 +0100 apt (0.8.16~exp8) experimental; urgency=low -- cgit v1.2.3-70-g09d2 From f23a94d53e451448b80b6aa5b52b5ba418e508a9 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Tue, 10 Jan 2012 12:05:12 +0100 Subject: as Size() can be quiet expensive for compressed files lets store the result --- methods/rred.cc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/methods/rred.cc b/methods/rred.cc index bf9294d96..e37a12ed9 100644 --- a/methods/rred.cc +++ b/methods/rred.cc @@ -235,7 +235,9 @@ RredMethod::State RredMethod::patchMMap(FileFd &Patch, FileFd &From, /*{{{*/ MMap ed_cmds(Patch, MMap::ReadOnly); MMap in_file(From, MMap::ReadOnly); - if (ed_cmds.Size() == 0 || in_file.Size() == 0) + unsigned long long const ed_size = ed_cmds.Size(); + unsigned long long const in_size = in_file.Size(); + if (ed_size == 0 || in_size == 0) return MMAP_FAILED; EdCommand* commands = 0; @@ -244,10 +246,10 @@ RredMethod::State RredMethod::patchMMap(FileFd &Patch, FileFd &From, /*{{{*/ const char* begin = (char*) ed_cmds.Data(); const char* end = begin; - const char* ed_end = (char*) ed_cmds.Data() + ed_cmds.Size(); + const char* ed_end = (char*) ed_cmds.Data() + ed_size; const char* input = (char*) in_file.Data(); - const char* input_end = (char*) in_file.Data() + in_file.Size(); + const char* input_end = (char*) in_file.Data() + in_size; size_t i; -- cgit v1.2.3-70-g09d2 From 88a52816d7626326f94c17a3a8fcde08817b7f2b Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Wed, 11 Jan 2012 18:05:15 +0100 Subject: * apt-pkg/depcache.cc: - implicit conflicts (for multiarch) are supposed to conflict only with real packages, not with virtual providers --- apt-pkg/depcache.cc | 16 ++++++--- debian/changelog | 9 +++++ .../test-implicit-conflicts-real-not-virtual | 40 ++++++++++++++++++++++ 3 files changed, 60 insertions(+), 5 deletions(-) create mode 100755 test/integration/test-implicit-conflicts-real-not-virtual diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index 031fca5c0..3c6dc4325 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -374,11 +374,17 @@ bool pkgDepCache::CheckDep(DepIterator Dep,int Type,PkgIterator &Res) PkgIterator Pkg = Dep.ParentPkg(); for (; P.end() != true; ++P) { - /* Provides may never be applied against the same package (or group) - if it is a conflicts. See the comment above. */ - if (P.OwnerPkg()->Group == Pkg->Group && Dep.IsNegative() == true) - continue; - + if (Dep.IsNegative() == true) + { + /* Provides may never be applied against the same package (or group) + if it is a conflicts. See the comment above. */ + if (P.OwnerPkg()->Group == Pkg->Group) + continue; + // Implicit group-conflicts should not be applied on providers of other groups + if (Pkg->Group == Dep.TargetPkg()->Group && P.OwnerPkg()->Group != Pkg->Group) + continue; + } + // Check if the provides is a hit if (Type == NowVersion) { diff --git a/debian/changelog b/debian/changelog index a1b93a981..83704caeb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +apt (0.8.16~exp10) UNRELEASED; urgency=low + + [ David Kalnischkies ] + * apt-pkg/depcache.cc: + - implicit conflicts (for multiarch) are supposed to conflict + only with real packages, not with virtual providers + + -- David Kalnischkies <kalnischkies@gmail.com> Wed, 11 Jan 2012 17:59:33 +0100 + apt (0.8.16~exp9) experimental; urgency=low [ Julian Andres Klode ] diff --git a/test/integration/test-implicit-conflicts-real-not-virtual b/test/integration/test-implicit-conflicts-real-not-virtual new file mode 100755 index 000000000..9d13e1709 --- /dev/null +++ b/test/integration/test-implicit-conflicts-real-not-virtual @@ -0,0 +1,40 @@ +#!/bin/sh +set -e + +TESTDIR=$(readlink -f $(dirname $0)) +. $TESTDIR/framework +setupenvironment +configarchitecture 'amd64' 'i386' + +insertpackage 'unstable-mp' 'crda' 'i386,amd64' '1.1.1-1ubuntu4mp' 'Provides: wireless-crda +Multi-Arch: foreign' +insertpackage 'unstable-m' 'crda' 'i386,amd64' '1.1.1-1ubuntu4m' 'Multi-Arch: foreign' +insertpackage 'unstable-p' 'crda' 'i386,amd64' '1.1.1-1ubuntu4p' 'Provides: wireless-crda' + +insertinstalledpackage 'wireless-crda' 'amd64' '1.14' + +setupaptarchive + +testequal 'Reading package lists... +Building dependency tree... +The following NEW packages will be installed: + crda +0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded. +Inst crda (1.1.1-1ubuntu4m unstable-m [amd64]) +Conf crda (1.1.1-1ubuntu4m unstable-m [amd64])' aptget install crda -s -t unstable-m + +testequal 'Reading package lists... +Building dependency tree... +The following NEW packages will be installed: + crda +0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded. +Inst crda (1.1.1-1ubuntu4p unstable-p [amd64]) +Conf crda (1.1.1-1ubuntu4p unstable-p [amd64])' aptget install crda -s -t unstable-p + +testequal 'Reading package lists... +Building dependency tree... +The following NEW packages will be installed: + crda +0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded. +Inst crda (1.1.1-1ubuntu4mp unstable-mp [amd64]) +Conf crda (1.1.1-1ubuntu4mp unstable-mp [amd64])' aptget install crda -s -t unstable-mp -- cgit v1.2.3-70-g09d2 From 5f909b67fb903f700df1bd6242ada86d58c0b068 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Fri, 13 Jan 2012 12:48:41 +0100 Subject: * apt-pkg/pkgcache.cc: - ignore implicit conflicts on providers in AllTarget, too --- apt-pkg/pkgcache.cc | 17 ++++++++++++----- debian/changelog | 4 +++- .../test-implicit-conflicts-real-not-virtual | 22 +++++++++++++++++++--- 3 files changed, 34 insertions(+), 9 deletions(-) diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc index c854249e4..5361696d0 100644 --- a/apt-pkg/pkgcache.cc +++ b/apt-pkg/pkgcache.cc @@ -636,11 +636,18 @@ pkgCache::Version **pkgCache::DepIterator::AllTargets() const { if (Owner->VS->CheckDep(I.ProvideVersion(),S->CompareOp,TargetVer()) == false) continue; - - if (IsNegative() == true && - ParentPkg()->Group == I.OwnerPkg()->Group) - continue; - + + if (IsNegative() == true) + { + /* Provides may never be applied against the same package (or group) + if it is a conflicts. See the comment above. */ + if (I.OwnerPkg()->Group == ParentPkg()->Group) + continue; + // Implicit group-conflicts should not be applied on providers of other groups + if (ParentPkg()->Group == TargetPkg()->Group && I.OwnerPkg()->Group != ParentPkg()->Group) + continue; + } + Size++; if (Res != 0) *End++ = I.OwnerVer(); diff --git a/debian/changelog b/debian/changelog index 83704caeb..36b3d8340 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,8 +4,10 @@ apt (0.8.16~exp10) UNRELEASED; urgency=low * apt-pkg/depcache.cc: - implicit conflicts (for multiarch) are supposed to conflict only with real packages, not with virtual providers + * apt-pkg/pkgcache.cc: + - ignore implicit conflicts on providers in AllTarget, too - -- David Kalnischkies <kalnischkies@gmail.com> Wed, 11 Jan 2012 17:59:33 +0100 + -- David Kalnischkies <kalnischkies@gmail.com> Fri, 13 Jan 2012 12:47:33 +0100 apt (0.8.16~exp9) experimental; urgency=low diff --git a/test/integration/test-implicit-conflicts-real-not-virtual b/test/integration/test-implicit-conflicts-real-not-virtual index 9d13e1709..c9fca4edf 100755 --- a/test/integration/test-implicit-conflicts-real-not-virtual +++ b/test/integration/test-implicit-conflicts-real-not-virtual @@ -10,6 +10,8 @@ insertpackage 'unstable-mp' 'crda' 'i386,amd64' '1.1.1-1ubuntu4mp' 'Provides: wi Multi-Arch: foreign' insertpackage 'unstable-m' 'crda' 'i386,amd64' '1.1.1-1ubuntu4m' 'Multi-Arch: foreign' insertpackage 'unstable-p' 'crda' 'i386,amd64' '1.1.1-1ubuntu4p' 'Provides: wireless-crda' +insertpackage 'unstable' 'wireless-crda' 'i386,amd64' '1.16' + insertinstalledpackage 'wireless-crda' 'amd64' '1.14' @@ -19,7 +21,7 @@ testequal 'Reading package lists... Building dependency tree... The following NEW packages will be installed: crda -0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded. +0 upgraded, 1 newly installed, 0 to remove and 1 not upgraded. Inst crda (1.1.1-1ubuntu4m unstable-m [amd64]) Conf crda (1.1.1-1ubuntu4m unstable-m [amd64])' aptget install crda -s -t unstable-m @@ -27,7 +29,7 @@ testequal 'Reading package lists... Building dependency tree... The following NEW packages will be installed: crda -0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded. +0 upgraded, 1 newly installed, 0 to remove and 1 not upgraded. Inst crda (1.1.1-1ubuntu4p unstable-p [amd64]) Conf crda (1.1.1-1ubuntu4p unstable-p [amd64])' aptget install crda -s -t unstable-p @@ -35,6 +37,20 @@ testequal 'Reading package lists... Building dependency tree... The following NEW packages will be installed: crda -0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded. +0 upgraded, 1 newly installed, 0 to remove and 1 not upgraded. Inst crda (1.1.1-1ubuntu4mp unstable-mp [amd64]) Conf crda (1.1.1-1ubuntu4mp unstable-mp [amd64])' aptget install crda -s -t unstable-mp + +rm rootdir/var/lib/dpkg/status +insertinstalledpackage 'crda' 'amd64' '1.1.1-1ubuntu4mp' 'Provides: wireless-crda +Conflicts: wireless-crda (<< 1.15) +Replaces: wireless-crda ( << 1.15) +Multi-arch: foreign' + +testequal 'Reading package lists... +Building dependency tree... +The following NEW packages will be installed: + wireless-crda +0 upgraded, 1 newly installed, 0 to remove and 1 not upgraded. +Inst wireless-crda (1.16 unstable [amd64]) +Conf wireless-crda (1.16 unstable [amd64])' aptget install wireless-crda -s -t unstable -- cgit v1.2.3-70-g09d2 From 854341141df83c767bb4310e9e6084c5a4bff7f7 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Fri, 13 Jan 2012 15:45:08 +0100 Subject: factor out the detection of self-conflicts into Dep::IsIgnorable --- apt-pkg/cacheiterators.h | 2 ++ apt-pkg/depcache.cc | 13 ++----------- apt-pkg/packagemanager.cc | 2 +- apt-pkg/pkgcache.cc | 49 ++++++++++++++++++++++++++++++++--------------- 4 files changed, 39 insertions(+), 27 deletions(-) diff --git a/apt-pkg/cacheiterators.h b/apt-pkg/cacheiterators.h index 5382f3838..e6a0fddb0 100644 --- a/apt-pkg/cacheiterators.h +++ b/apt-pkg/cacheiterators.h @@ -283,6 +283,8 @@ class pkgCache::DepIterator : public Iterator<Dependency, DepIterator> { inline bool Reverse() const {return Type == DepRev;}; bool IsCritical() const; bool IsNegative() const; + bool IsIgnorable(PrvIterator const &Prv) const; + bool IsIgnorable(PkgIterator const &Pkg) const; void GlobOr(DepIterator &Start,DepIterator &End); Version **AllTargets() const; bool SmartTargetPkg(PkgIterator &Result) const; diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index 3c6dc4325..085159711 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -371,19 +371,10 @@ bool pkgDepCache::CheckDep(DepIterator Dep,int Type,PkgIterator &Res) // Check the providing packages PrvIterator P = Dep.TargetPkg().ProvidesList(); - PkgIterator Pkg = Dep.ParentPkg(); for (; P.end() != true; ++P) { - if (Dep.IsNegative() == true) - { - /* Provides may never be applied against the same package (or group) - if it is a conflicts. See the comment above. */ - if (P.OwnerPkg()->Group == Pkg->Group) - continue; - // Implicit group-conflicts should not be applied on providers of other groups - if (Pkg->Group == Dep.TargetPkg()->Group && P.OwnerPkg()->Group != Pkg->Group) - continue; - } + if (Dep.IsIgnorable(P) == true) + continue; // Check if the provides is a hit if (Type == NowVersion) diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc index 4f9762701..c9d7a3024 100644 --- a/apt-pkg/packagemanager.cc +++ b/apt-pkg/packagemanager.cc @@ -250,7 +250,7 @@ bool pkgPackageManager::CheckRConflicts(PkgIterator Pkg,DepIterator D, continue; // Ignore self conflicts, ignore conflicts from irrelevent versions - if (D.ParentPkg() == Pkg || D.ParentVer() != D.ParentPkg().CurrentVer()) + if (D.IsIgnorable(Pkg) || D.ParentVer() != D.ParentPkg().CurrentVer()) continue; if (Cache.VS().CheckDep(Ver,D->CompareOp,D.TargetVer()) == false) diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc index 5361696d0..997c70768 100644 --- a/apt-pkg/pkgcache.cc +++ b/apt-pkg/pkgcache.cc @@ -619,13 +619,12 @@ pkgCache::Version **pkgCache::DepIterator::AllTargets() const // Walk along the actual package providing versions for (VerIterator I = DPkg.VersionList(); I.end() == false; ++I) { - if (Owner->VS->CheckDep(I.VerStr(),S->CompareOp,TargetVer()) == false) + if (IsIgnorable(I.ParentPkg()) == true) continue; - if (IsNegative() == true && - ParentPkg() == I.ParentPkg()) + if (Owner->VS->CheckDep(I.VerStr(),S->CompareOp,TargetVer()) == false) continue; - + Size++; if (Res != 0) *End++ = I; @@ -634,19 +633,11 @@ pkgCache::Version **pkgCache::DepIterator::AllTargets() const // Follow all provides for (PrvIterator I = DPkg.ProvidesList(); I.end() == false; ++I) { - if (Owner->VS->CheckDep(I.ProvideVersion(),S->CompareOp,TargetVer()) == false) + if (IsIgnorable(I) == true) continue; - if (IsNegative() == true) - { - /* Provides may never be applied against the same package (or group) - if it is a conflicts. See the comment above. */ - if (I.OwnerPkg()->Group == ParentPkg()->Group) - continue; - // Implicit group-conflicts should not be applied on providers of other groups - if (ParentPkg()->Group == TargetPkg()->Group && I.OwnerPkg()->Group != ParentPkg()->Group) - continue; - } + if (Owner->VS->CheckDep(I.ProvideVersion(),S->CompareOp,TargetVer()) == false) + continue; Size++; if (Res != 0) @@ -689,6 +680,34 @@ void pkgCache::DepIterator::GlobOr(DepIterator &Start,DepIterator &End) } } /*}}}*/ +// DepIterator::IsIgnorable - should this packag/providr be ignored? /*{{{*/ +// --------------------------------------------------------------------- +/* Deps like self-conflicts should be ignored as well as implicit conflicts + on virtual packages. */ +bool pkgCache::DepIterator::IsIgnorable(PkgIterator const &Pkg) const +{ + if (ParentPkg() == TargetPkg()) + return IsNegative(); + + return false; +} +bool pkgCache::DepIterator::IsIgnorable(PrvIterator const &Prv) const +{ + if (IsNegative() == false) + return false; + + PkgIterator const Pkg = ParentPkg(); + /* Provides may never be applied against the same package (or group) + if it is a conflicts. See the comment above. */ + if (Prv.OwnerPkg()->Group == Pkg->Group) + return true; + // Implicit group-conflicts should not be applied on providers of other groups + if (Pkg->Group == TargetPkg()->Group && Prv.OwnerPkg()->Group != Pkg->Group) + return true; + + return false; +} + /*}}}*/ // ostream operator to handle string representation of a dependecy /*{{{*/ // --------------------------------------------------------------------- /* */ -- cgit v1.2.3-70-g09d2 From 86fc2ca8909eb686e2ad751acb0f0eaf706d9d5e Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Fri, 13 Jan 2012 17:30:17 +0100 Subject: * apt-pkg/deb/dpkgpm.cc: - check if dpkg supports multiarch with --assert-multi-arch and if it does be always explicit about the architecture --- apt-pkg/deb/dpkgpm.cc | 73 ++++++++++++++++++++-------- debian/changelog | 5 +- test/integration/test-dpkg-assert-multi-arch | 53 ++++++++++++++++++++ 3 files changed, 109 insertions(+), 22 deletions(-) create mode 100755 test/integration/test-dpkg-assert-multi-arch diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index 7c0ed5639..4dc0baa50 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -108,7 +108,7 @@ ionice(int PID) { if (!FileExists("/usr/bin/ionice")) return false; - pid_t Process = ExecFork(); + pid_t Process = ExecFork(); if (Process == 0) { char buf[32]; @@ -829,6 +829,40 @@ static int racy_pselect(int nfds, fd_set *readfds, fd_set *writefds, */ bool pkgDPkgPM::Go(int OutStatusFd) { + // Generate the base argument list for dpkg + std::vector<const char *> Args; + unsigned long StartSize = 0; + string const Tmp = _config->Find("Dir::Bin::dpkg","dpkg"); + Args.push_back(Tmp.c_str()); + StartSize += Tmp.length(); + + // Stick in any custom dpkg options + Configuration::Item const *Opts = _config->Tree("DPkg::Options"); + if (Opts != 0) + { + Opts = Opts->Child; + for (; Opts != 0; Opts = Opts->Next) + { + if (Opts->Value.empty() == true) + continue; + Args.push_back(Opts->Value.c_str()); + StartSize += Opts->Value.length(); + } + } + + size_t const BaseArgs = Args.size(); + // we need to detect if we can qualify packages with the architecture or not + Args.push_back("--assert-multi-arch"); + Args.push_back(NULL); + + pid_t dpkgAssertMultiArch = ExecFork(); + if (dpkgAssertMultiArch == 0) + { + execv(Args[0], (char**) &Args[0]); + _error->WarningE("dpkgGo", "Can't detect if dpkg supports multi-arch!"); + _exit(2); + } + fd_set rfds; struct timespec tv; sigset_t sigmask; @@ -905,27 +939,20 @@ bool pkgDPkgPM::Go(int OutStatusFd) // create log OpenLog(); - // Generate the base argument list for dpkg - std::vector<const char *> Args; - unsigned long StartSize = 0; - string const Tmp = _config->Find("Dir::Bin::dpkg","dpkg"); - Args.push_back(Tmp.c_str()); - StartSize += Tmp.length(); - - // Stick in any custom dpkg options - Configuration::Item const *Opts = _config->Tree("DPkg::Options"); - if (Opts != 0) + bool dpkgMultiArch = false; + if (dpkgAssertMultiArch > 0) { - Opts = Opts->Child; - for (; Opts != 0; Opts = Opts->Next) + int Status = 0; + while (waitpid(dpkgAssertMultiArch, &Status, 0) != dpkgAssertMultiArch) { - if (Opts->Value.empty() == true) + if (errno == EINTR) continue; - Args.push_back(Opts->Value.c_str()); - StartSize += Opts->Value.length(); + _error->WarningE("dpkgGo", _("Waited for %s but it wasn't there"), "dpkg --assert-multi-arch"); + break; } + if (WIFEXITED(Status) == true && WEXITSTATUS(Status) == 0) + dpkgMultiArch = true; } - size_t const BaseArgs = Args.size(); // this loop is runs once per operation for (vector<Item>::const_iterator I = List.begin(); I != List.end();) @@ -965,14 +992,17 @@ bool pkgDPkgPM::Go(int OutStatusFd) if (J - I > (signed)MaxArgs) { J = I + MaxArgs; - Args.reserve(MaxArgs + 10); + unsigned long const size = MaxArgs + 10; + Args.reserve(size); + Packages.reserve(size); } else { - Args.reserve((J - I) + 10); + unsigned long const size = (J - I) + 10; + Args.reserve(size); + Packages.reserve(size); } - int fd[2]; pipe(fd); @@ -1047,7 +1077,8 @@ bool pkgDPkgPM::Go(int OutStatusFd) continue; if (I->Op == Item::Configure && disappearedPkgs.find(I->Pkg.Name()) != disappearedPkgs.end()) continue; - if (I->Pkg.Arch() == nativeArch || !strcmp(I->Pkg.Arch(), "all")) + // We keep this here to allow "smooth" transitions from e.g. multiarch dpkg/ubuntu to dpkg/debian + if (dpkgMultiArch == false && (I->Pkg.Arch() == nativeArch || !strcmp(I->Pkg.Arch(), "all"))) { char const * const name = I->Pkg.Name(); ADDARG(name); diff --git a/debian/changelog b/debian/changelog index 36b3d8340..5eb4e593f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,8 +6,11 @@ apt (0.8.16~exp10) UNRELEASED; urgency=low only with real packages, not with virtual providers * apt-pkg/pkgcache.cc: - ignore implicit conflicts on providers in AllTarget, too + * apt-pkg/deb/dpkgpm.cc: + - check if dpkg supports multiarch with --assert-multi-arch + and if it does be always explicit about the architecture - -- David Kalnischkies <kalnischkies@gmail.com> Fri, 13 Jan 2012 12:47:33 +0100 + -- David Kalnischkies <kalnischkies@gmail.com> Fri, 13 Jan 2012 17:29:07 +0100 apt (0.8.16~exp9) experimental; urgency=low diff --git a/test/integration/test-dpkg-assert-multi-arch b/test/integration/test-dpkg-assert-multi-arch new file mode 100755 index 000000000..b1ec73e18 --- /dev/null +++ b/test/integration/test-dpkg-assert-multi-arch @@ -0,0 +1,53 @@ +#!/bin/sh +set -e + +TESTDIR=$(readlink -f $(dirname $0)) +. $TESTDIR/framework +setupenvironment +configarchitecture 'amd64' 'i386' + +buildsimplenativepackage 'native-pkg' 'amd64' '1.0' 'stable' +buildsimplenativepackage 'foreign-pkg' 'i386' '0.5' 'stable' 'Multi-Arch: foreign' +buildsimplenativepackage 'same-lib' 'amd64,i386' '0.5' 'stable' 'Multi-Arch: same' + +setupaptarchive + +testqualifier() { + msgtest 'Test for correct qualifier mode' $2 + GIVEN="$(aptget install $1 -qq -o Debug::pkgDPkgPM=1 2>&1 | grep -- '--configure' | sed -e 's/^.*--configure \([^ ]*\).*$/\1/')" + test "$GIVEN" = "$2" && msgpass || msgfail +} + +# non-multiarch or "ubuntus" old multiarchified dpkg +echo 'Dir::Bin::dpkg "./dpkg-wrapper";' > rootdir/etc/apt/apt.conf.d/99dpkgwrapper +echo '#! /bin/sh +if echo "$*" | grep -q -- "--assert-multi-arch"; then + return 2; +fi +return $*' > ./dpkg-wrapper +chmod +x ./dpkg-wrapper + +testqualifier 'native-pkg' 'native-pkg' +testqualifier 'native-pkg:amd64' 'native-pkg' +testqualifier 'foreign-pkg' 'foreign-pkg:i386' +testqualifier 'foreign-pkg:i386' 'foreign-pkg:i386' +testqualifier 'same-lib' 'same-lib' +testqualifier 'same-lib:amd64' 'same-lib' +testqualifier 'same-lib:i386' 'same-lib:i386' + +# multiarch dpkg (new interface version) + +echo 'Dir::Bin::dpkg "./dpkg-wrapper";' > rootdir/etc/apt/apt.conf.d/99dpkgwrapper +echo '#! /bin/sh +if echo "$*" | grep -q -- "--assert-multi-arch"; then + return 0; +fi +return $*' > ./dpkg-wrapper + +testqualifier 'native-pkg' 'native-pkg:amd64' +testqualifier 'native-pkg:amd64' 'native-pkg:amd64' +testqualifier 'foreign-pkg' 'foreign-pkg:i386' +testqualifier 'foreign-pkg:i386' 'foreign-pkg:i386' +testqualifier 'same-lib' 'same-lib:amd64' +testqualifier 'same-lib:amd64' 'same-lib:amd64' +testqualifier 'same-lib:i386' 'same-lib:i386' -- cgit v1.2.3-70-g09d2