| 1 |
>>>>> On Sun, 13 Sep 2015, Ciaran McCreesh wrote: |
| 2 |
|
| 3 |
>> +\item[depend atom] |
| 4 |
|
| 5 |
> I'd rather we deprecated the name. It's a silly name. |
| 6 |
|
| 7 |
I just see that this is bug 174322, and two occurances of the term |
| 8 |
were missed when fixing it. |
| 9 |
|
| 10 |
Patch is included below. |
| 11 |
|
| 12 |
Ulrich |
| 13 |
|
| 14 |
|
| 15 |
From 3cce5a76fbfb3af1e7a9fc1e3b7d87d26d6fa552 Mon Sep 17 00:00:00 2001 |
| 16 |
From: =?UTF-8?q?Ulrich=20M=C3=BCller?= <ulm@g.o> |
| 17 |
Date: Sun, 13 Sep 2015 17:19:17 +0200 |
| 18 |
Subject: [PATCH] Replace "atom" by "package dependency specification" |
| 19 |
throughout. |
| 20 |
|
| 21 |
This fixes remaining occurances of the term "atom" that were missed |
| 22 |
in commit 12b07c3d013246c5ee4c6acb23f85ec1e857ac0a, or readded later. |
| 23 |
|
| 24 |
Bug: 174322 |
| 25 |
--- |
| 26 |
eapi-cheatsheet.tex | 4 ++-- |
| 27 |
pkg-mgr-commands.tex | 2 +- |
| 28 |
profiles.tex | 2 +- |
| 29 |
3 files changed, 4 insertions(+), 4 deletions(-) |
| 30 |
|
| 31 |
diff --git a/eapi-cheatsheet.tex b/eapi-cheatsheet.tex |
| 32 |
index 765d679..75d5146 100644 |
| 33 |
--- a/eapi-cheatsheet.tex |
| 34 |
+++ b/eapi-cheatsheet.tex |
| 35 |
@@ -261,8 +261,8 @@ If there is no EAPI explicitly specified, EAPI 0 is assumed. |
| 36 |
not specified in \code{SLOT}, it defaults to the regular slot. |
| 37 |
See \featureref{sub-slot}. |
| 38 |
\item[Slot operator dependencies] One of the following operators |
| 39 |
- can be specified after package atoms, which will affect updates |
| 40 |
- of runtime dependencies: |
| 41 |
+ can be used as a suffix in package dependencies, which will affect |
| 42 |
+ updates of runtime dependencies: |
| 43 |
\begin{description} |
| 44 |
\item[\code{:*}] Any slot value is acceptable. The package |
| 45 |
will not break when its dependency is updated. |
| 46 |
diff --git a/pkg-mgr-commands.tex b/pkg-mgr-commands.tex |
| 47 |
index 99b7c0c..1884a5c 100644 |
| 48 |
--- a/pkg-mgr-commands.tex |
| 49 |
+++ b/pkg-mgr-commands.tex |
| 50 |
@@ -88,7 +88,7 @@ supporting option \t{-{}-host-root}, this flag as the first argument will cause |
| 51 |
to the host root instead of \t{ROOT}. |
| 52 |
\begin{description} |
| 53 |
\item[has\_version] Takes exactly one package dependency specification as an argument. Returns |
| 54 |
- true if a package matching the atom is installed in \t{ROOT}, and false otherwise. |
| 55 |
+ true if a package matching the specification is installed in \t{ROOT}, and false otherwise. |
| 56 |
\item[best\_version] Takes exactly one package dependency specification as an argument. If a |
| 57 |
matching package is installed, prints the category, package name and version of the highest |
| 58 |
matching version; otherwise, prints an empty string. The exit code is unspecified. |
| 59 |
diff --git a/profiles.tex b/profiles.tex |
| 60 |
index 4b39160..a7a8527 100644 |
| 61 |
--- a/profiles.tex |
| 62 |
+++ b/profiles.tex |
| 63 |
@@ -73,7 +73,7 @@ removed from the list. Once again, blank lines and those beginning with a \# are |
| 64 |
\subsection{packages} |
| 65 |
The \t{packages} file is used to define the `system set' for this profile. |
| 66 |
After the above rules for inheritance and comments are applied, its lines must take one of two |
| 67 |
-forms: a package dependency specification prefixed by \t{*} denotes that the atom forms part of the |
| 68 |
+forms: a package dependency specification prefixed by \t{*} denotes that it forms part of the |
| 69 |
system set. A package dependency specification on its own may also appear for legacy reasons, but |
| 70 |
should be ignored when calculating the system set. |
| 71 |
|
| 72 |
-- |
| 73 |
2.5.2 |
Archives