From: Julian Andres Klode Date: Sun, 11 Oct 2009 10:16:05 +0000 (+0200) Subject: Merge configuration format simplification from jak branch X-Git-Tag: 0.7.25~26 X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/b1a6d48bb4a5644ad9b76718f66d8aa7e00af902?hp=334459abb1f5fa7f8a6be694cf9ecb05d692f01e Merge configuration format simplification from jak branch --- diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc index 442143516..dbcd461ac 100644 --- a/apt-pkg/packagemanager.cc +++ b/apt-pkg/packagemanager.cc @@ -125,7 +125,7 @@ bool pkgPackageManager::FixMissing() /* This adds the immediate flag to the pkg and recursively to the dependendies */ -void pkgPackageManager::ImmediateAdd(PkgIterator I, bool UseInstallVer) +void pkgPackageManager::ImmediateAdd(PkgIterator I, bool UseInstallVer, unsigned const int &Depth) { DepIterator D; @@ -143,12 +143,16 @@ void pkgPackageManager::ImmediateAdd(PkgIterator I, bool UseInstallVer) for ( /* nothing */ ; D.end() == false; D++) if (D->Type == pkgCache::Dep::Depends || D->Type == pkgCache::Dep::PreDepends) { + // ignore dependencies if no instal/upgrade/remove is going to happen + if (D.TargetPkg() == 0 || Cache[D.TargetPkg()].Keep()) + continue; + if(!List->IsFlag(D.TargetPkg(), pkgOrderList::Immediate)) { if(Debug) - clog << "ImmediateAdd(): Adding Immediate flag to " << I.Name() << endl; + clog << OutputInDepth(Depth) << "ImmediateAdd(): Adding Immediate flag to " << D.TargetPkg() << " cause of " << D.DepType() << " " << I.Name() << endl; List->Flag(D.TargetPkg(),pkgOrderList::Immediate); - ImmediateAdd(D.TargetPkg(), UseInstallVer); + ImmediateAdd(D.TargetPkg(), UseInstallVer, Depth + 1); } } return; diff --git a/apt-pkg/packagemanager.h b/apt-pkg/packagemanager.h index a1bfdc52d..af1476b7a 100644 --- a/apt-pkg/packagemanager.h +++ b/apt-pkg/packagemanager.h @@ -49,7 +49,7 @@ class pkgPackageManager : protected pkgCache::Namespace bool Debug; bool DepAdd(pkgOrderList &Order,PkgIterator P,int Depth = 0); - void ImmediateAdd(PkgIterator P, bool UseInstallVer); + void ImmediateAdd(PkgIterator P, bool UseInstallVer, unsigned const int &Depth = 0); virtual OrderResult OrderInstall(); bool CheckRConflicts(PkgIterator Pkg,DepIterator Dep,const char *Ver); bool CreateOrderList(); diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc index 342b6314a..d804c55e5 100644 --- a/cmdline/apt-cdrom.cc +++ b/cmdline/apt-cdrom.cc @@ -74,7 +74,7 @@ string pkgCdromTextStatus::PromptLine(const char *Text) bool pkgCdromTextStatus::AskCdromName(string &name) { - cout << _("Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'") << flush; + cout << _("Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'") << flush; name = PromptLine(""); return true; diff --git a/configure.in b/configure.in index 01a98c2cb..9d6589e55 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.7.23.1") +AC_DEFINE_UNQUOTED(VERSION,"0.7.25") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --git a/debian/changelog b/debian/changelog index 10e70b8d4..34a35b2f9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,19 @@ apt (0.7.25) UNRELEASED; urgency=low [ Christian Perrier ] * Fix apt-ftparchive(1) wrt description of the "-o" option. Thanks to Dann Frazier for the patch. Closes: #273100 + * po/LINGUAS. Re-disable Hebrew. Closes: #534992 + * po/LINGUAS. Enable Asturian and Lithuanian + * Fix typo in apt-cache.8.xml: nessasarily + * Fix "with with" in apt-get.8.xml + * Fix some of the typos mentioned by the german team + Closes: #479997 + * Polish translation update by Wiktor Wandachowicz + Closes: #548571 + + [ Michael Vogt ] + * apt-pkg/packagemanager.cc: + - fix overly aggressive immediate config propergation + (thanks to David Kalnischkies) [ Julian Andres Klode ] * doc/apt.conf.5.xml: @@ -12,7 +25,7 @@ apt (0.7.25) UNRELEASED; urgency=low - Deprecate #include, we have apt.conf.d nowadays which should be sufficient. - -- Julian Andres Klode Sat, 26 Sep 2009 15:00:28 +0200 + -- Michael Vogt Tue, 29 Sep 2009 15:51:34 +0200 apt (0.7.24) unstable; urgency=low diff --git a/doc/apt-cache.8.xml b/doc/apt-cache.8.xml index 9851135b1..c61d00e47 100644 --- a/doc/apt-cache.8.xml +++ b/doc/apt-cache.8.xml @@ -231,7 +231,7 @@ Reverse Provides: for use in a shell tab complete function and the output is generated extremely quickly. This command is best used with the option. - Note that a package which APT knows of is not nessasarily available to download, + Note that a package which APT knows of is not necessarily available to download, installable or installed, e.g. virtual packages are also listed in the generated list. diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index ec773edeb..4735dcd34 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -253,7 +253,7 @@ fetch. It will then find and download into the current directory the newest available version of that source package while respect the default release, set with the option APT::Default-Release, - the option or per package with with the + the option or per package with the pkg/release syntax, if possible. Source packages are tracked separately diff --git a/doc/po/fr.po b/doc/po/fr.po index 541fd369f..b95576e34 100644 --- a/doc/po/fr.po +++ b/doc/po/fr.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: \n" "POT-Creation-Date: 2009-09-26 11:35+0300\n" -"PO-Revision-Date: 2009-09-14 20:15+0200\n" +"PO-Revision-Date: 2009-09-26 19:25+0200\n" "Last-Translator: Christian Perrier \n" "Language-Team: French \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: ENCODING\n" +"Content-Transfer-Encoding: 8bit\n" "X-Generator: Lokalize 1.0\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" @@ -566,16 +566,7 @@ msgstr "" #. type: Plain text #: apt.ent:168 -#, fuzzy, no-wrap -#| msgid "" -#| "\n" -#| "\n" -#| "
apt@packages.debian.org
\n" -#| " Jason Gunthorpe\n" -#| " 1998-2001 Jason Gunthorpe\n" -#| " 28 October 2008\n" -#| " Linux\n" +#, no-wrap msgid "" "\n" "\n" "
apt@packages.debian.org
\n" -" Jason Gunthorpe\n" +" \n" +" Jason Gunthorpe\n" +" \n" +" \n" " 1998-2001 Jason Gunthorpe\n" -" 28 octobre 2008\n" +" 28 Octobre 2008\n" " Linux\n" #. type: Plain text @@ -626,14 +620,7 @@ msgstr "" #. type: Plain text #: apt.ent:185 -#, fuzzy, no-wrap -#| msgid "" -#| "\n" -#| " Jason\n" -#| " Gunthorpe\n" -#| " \n" -#| "\">\n" +#, no-wrap msgid "" "\n" @@ -647,19 +634,13 @@ msgstr "" " \n" " Jason\n" " Gunthorpe\n" +" \n" " \n" "\">\n" #. type: Plain text #: apt.ent:193 -#, fuzzy, no-wrap -#| msgid "" -#| "\n" -#| " Mike\n" -#| " O'Connor\n" -#| " \n" -#| "\">\n" +#, no-wrap msgid "" "\n" @@ -673,18 +654,13 @@ msgstr "" " \n" " Mike\n" " O'Connor\n" +" \n" " \n" "\">\n" #. type: Plain text #: apt.ent:200 -#, fuzzy, no-wrap -#| msgid "" -#| "\n" -#| " APT team\n" -#| " \n" -#| "\">\n" +#, no-wrap msgid "" "\n" @@ -923,6 +899,11 @@ msgid "" " Configuration Item: Dir::Etc::Main.\n" " \n" msgstr "" +"/etc/apt/apt.conf\n" +" Fichier de configuration d'APT.\n" +" Élément de configuration : Dir::Etc::Main.\n" +" \n" #. type: Plain text #: apt.ent:303 @@ -934,6 +915,11 @@ msgid "" " \n" "\">\n" msgstr "" +" /etc/apt/apt.conf.D/\n" +" Fragments du fichier de configuration d'APT.\n" +" Élément de configuration : Dir::Etc::Partsn.\n" +" \n" +"\">\n" #. type: Plain text #: apt.ent:309 @@ -945,23 +931,31 @@ msgid "" " Configuration Item: Dir::Cache::Archives.\n" " \n" msgstr "" +"&cachedir;/archives/\n" +" Zone de stockage des fichiers récupérés.\n" +" Élément de configuration : Dir::Cache::Archives.\n" +" \n" #. type: Plain text #: apt.ent:315 -#, fuzzy, no-wrap -#| msgid "Storage area for package files in transit. Configuration Item: Dir::Cache::Archives (implicit partial)." +#, no-wrap msgid "" " &cachedir;/archives/partial/\n" " Storage area for package files in transit.\n" " Configuration Item: Dir::Cache::Archives (implicit partial). \n" " \n" "\">\n" -msgstr "Zone de stockage pour les paquets en transit. Élément de configuration : Dir::Cache::Archives (implicitement, partial)." +msgstr "" +"Z &cachedir;/archives/partial/\n" +" Zone de stockage pour les paquets en transit.\n" +" Élément de configuration : Dir::Cache::Archives (implicitement, partial). \n" +" \n" +"\">\n" #. type: Plain text #: apt.ent:325 -#, fuzzy, no-wrap -#| msgid "Version preferences file. This is where you would specify \"pinning\", i.e. a preference to get certain packages from a separate source or from a different version of a distribution. Configuration Item: Dir::Etc::Preferences." +#, no-wrap msgid "" "/etc/apt/preferences\n" @@ -972,7 +966,13 @@ msgid "" " or from a different version of a distribution.\n" " Configuration Item: Dir::Etc::Preferences.\n" " \n" -msgstr "Fichier des préférences. C'est dans ce fichier qu'on peut faire de l'étiquetage (pinning) c'est-à-dire, choisir d'obtenir des paquets d'une source distincte ou d'une distribution différente. Élément de configuration : Dir::Etc::Preferences." +msgstr "" +"/etc/apt/preferences\n" +" Fichier des préférences.\n" +" C'est dans ce fichier qu'on peut faire de l'étiquetage (pinning) c'est-à-dire, choisir d'obtenir des paquets d'une source distincte ou d'une distribution différente.\n" +" Élément de configuration : Dir::Etc::Preferences.\n" +" \n" #. type: Plain text #: apt.ent:331 @@ -984,6 +984,11 @@ msgid "" " \n" "\">\n" msgstr "" +" /etc/apt/preferences.d/\n" +" Fragments de fichiers pour la préférence des versions.\n" +" Élémet de configuration: Dir::Etc::PreferencesParts.\n" +" \n" +"\">\n" #. type: Plain text #: apt.ent:337 @@ -995,6 +1000,11 @@ msgid "" " Configuration Item: Dir::Etc::SourceList.\n" " \n" msgstr "" +"/etc/apt/sources.list\n" +" Emplacement pour la récupération des paquets.\n" +" Élément de configuration: Dir::Etc::SourceList.\n" +" \n" #. type: Plain text #: apt.ent:343 @@ -1006,10 +1016,14 @@ msgid "" " \n" "\">\n" msgstr "" +" /etc/apt/sources.list.d/\n" +" Fragments de fichiers définissant les emplacements de récupération de paquets.\n" +" Élément de configuration : Dir::Etc::SourceParts.\n" +" \n" +"\">\n" #. type: Plain text -#: apt.ent:350 -#, fuzzy, no-wrap +#: apt.ent:350, no-wrap #| msgid "Storage area for state information for each package resource specified in &sources-list; Configuration Item: Dir::State::Lists." msgid "" "Dir::State::Lists.\n" " \n" -msgstr "Zone de stockage pour les informations qui concernent chaque ressource de paquet spécifiée dans &sources-list; Élément de configuration : Dir::State::Lists." +msgstr "" +"&statedir;/lists/\n" +" Zone de stockage pour les informations qui concernent chaque ressource de paquet spécifiée dans &sources-list;\n" +" Élément de configuration: Dir::State::Lists.\n" +" \n" #. type: Plain text -#: apt.ent:355 -#, fuzzy, no-wrap +#: apt.ent:355, no-wrap #| msgid "Storage area for state information in transit. Configuration Item: Dir::State::Lists (implicit partial)." msgid "" " &statedir;/lists/partial/\n" @@ -1030,9 +1048,14 @@ msgid "" " Configuration Item: Dir::State::Lists (implicit partial).\n" " \n" "\">\n" -msgstr "Zone de stockage pour les informations en transit. Élément de configuration : Dir::State::Lists (partial est implicite)." +msgstr "" +" &statedir;/lists/partial/\n" +" Zone de stockage pour les informations en transit.\n" +" Élément de configuration : Dir::State::Lists (implicit partial).\n" +" \n" +"\">\n" -#. The last update date +#. The last update date #. type: Content of: #: apt-cache.8.xml:13 apt-config.8.xml:13 apt-extracttemplates.1.xml:13 #: apt-ftparchive.1.xml:13 apt-sortpkgs.1.xml:13 sources.list.5.xml:13 @@ -1061,7 +1084,7 @@ msgstr "8" #: apt-sortpkgs.1.xml:24 apt.conf.5.xml:30 apt_preferences.5.xml:23 #: sources.list.5.xml:24 msgid "APT" -msgstr "" +msgstr "APT" #. type: Content of: #: apt-cache.8.xml:30 @@ -1515,7 +1538,6 @@ msgstr "pkgnames [ préfixe ]" #. type: Content of: #: apt-cache.8.xml:229 -#, fuzzy #| msgid "" #| "This command prints the name of each package in the system. The optional " #| "argument is a prefix match to filter the name list. The output is " @@ -1529,7 +1551,7 @@ msgid "" "extremely quickly. This command is best used with the