On Sat, May 31, 2014 at 01:01:32AM +0200, David Kalnischkies wrote: > We really should not hurry to action here ;) , but after telling myself > that I would merge & fixup for a few weeks now (before your last mail), > I just did it today and should therefore also find its way into apt > proper in a few months… or maybe a bit quicker… Thanks! > > > > > and the documentation should be check for sentences suggesting that > > > > > the package name alone is an identifier. The doc for APT-Candidate > > > > > e.g. sounds a bit like it. This should now be done in my branch "zack/edsp-0.5-doc" here: http://git.upsilon.cc/?p=apt.git;a=shortlog;h=refs/heads/zack/edsp-0.5-doc Patches are also attached, in case it's handier for you. Unless I've missed something, only two places needed fixing: the one you mentioned (APT-Candidate) and the description of Install/Remove stanzas that generically referred to packages, without clarifying whether they should be arch-qualified or not. Let me know if you need anything else, Cheers. -- Stefano Zacchiroli . . . . . . . zack@upsilon.cc . . . . o . . . o . o Maître de conférences . . . . . http://upsilon.cc/zack . . . o . . . o o Former Debian Project Leader . . @zack on identi.ca . . o o o . . . o . « the first rule of tautology club is the first rule of tautology club »
From 730ad22fe6e8a82b9754e62b3f63fcf4a44fabb4 Mon Sep 17 00:00:00 2001 From: Stefano Zacchiroli <zack@debian.org> Date: Tue, 17 Jun 2014 17:03:27 +0200 Subject: [PATCH 1/2] EDSP doc: clarify that Install/Remove packages are arch-qualified --- doc/external-dependency-solver-protocol.txt | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/doc/external-dependency-solver-protocol.txt b/doc/external-dependency-solver-protocol.txt index 790f2f1..eb78321 100644 --- a/doc/external-dependency-solver-protocol.txt +++ b/doc/external-dependency-solver-protocol.txt @@ -5,6 +5,14 @@ external dependency solvers. The protocol is called APT EDSP, for "APT External Dependency Solver Protocol". +## Terminology + +In the following we use the term **architecture qualified package name** +(or *arch-qualified package names* for short) to refer to package +identifiers of the form "arch:package" where "arch" is a dpkg +architecture and "package" a dpkg package name. + + ## Components - **APT**: we know this one. @@ -132,9 +140,9 @@ The following **configuration fields** are supported in request stanzas: The following **action fields** are supported in request stanzas: - **Install:** (optional, defaults to the empty string) A space - separated list of package names, with *no version attached*, to - install. This field denotes a list of packages that the user wants to - install, usually via an APT `install` request. + separated list of arch-qualified package names, with *no version + attached*, to install. This field denotes a list of packages that the + user wants to install, usually via an APT `install` request. - **Remove:** (optional, defaults to the empty string) Same syntax of Install. This field denotes a list of packages that the user wants to @@ -201,7 +209,7 @@ field. The following fields are supported in package stanzas: - **APT-Candidate:** (optional, defaults to `no`). Allowed values: `yes`, `no`. When set to `yes`, the corresponding package is the APT candidate for installation among all available packages with the same - name. + name and with the same architecture. - **APT-Automatic:** (optional, defaults to `no`). Allowed values: `yes`, `no`. When set to `yes`, the corresponding package is marked by -- 2.0.0
From 72f3ffa04d2fc36cd7654d78efe362485a41cdc0 Mon Sep 17 00:00:00 2001 From: Stefano Zacchiroli <zack@debian.org> Date: Tue, 17 Jun 2014 17:04:09 +0200 Subject: [PATCH 2/2] EDSP doc: (minor) consistently use 2 blank lines before headings --- doc/external-dependency-solver-protocol.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/external-dependency-solver-protocol.txt b/doc/external-dependency-solver-protocol.txt index eb78321..7db1479 100644 --- a/doc/external-dependency-solver-protocol.txt +++ b/doc/external-dependency-solver-protocol.txt @@ -70,6 +70,7 @@ configuration documentation for more, and more up to date, information. - **Dir::Bin::Solvers**: absolute path of the directory where to look for external solvers. Defaults to `/usr/lib/apt/solvers`. + ## Protocol When configured to use an external solver, APT will resort to it to @@ -226,6 +227,7 @@ field. The following fields are supported in package stanzas: Release file entry (Origin, Label, Codename, etc.) in the format of APT_PREFERENCES(5). + ### Answer An answer from the external solver to APT is either a *solution* or an -- 2.0.0
Attachment:
signature.asc
Description: Digital signature