summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Kalnischkies <kalnischkies@gmail.com>2010-05-13 17:58:35 +0200
committerDavid Kalnischkies <kalnischkies@gmail.com>2010-05-13 17:58:35 +0200
commit10df254bd756cea401e2564d465bbb4a99ee8e9e (patch)
tree152c2c558524a07c1c417d89b9a2fcb58f6705ad
parente1dd65c9f1274621142a20148f23dbd074ac33af (diff)
add "NotAutomatic: yes" handling, thanks Osamu Aoki (Closes: #490347)
-rw-r--r--debian/changelog1
-rw-r--r--doc/apt_preferences.5.xml10
2 files changed, 10 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 0902e79c8..2ad9fbdd2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,7 @@ apt (0.7.26~exp5) UNRELEASED; urgency=low
- use stable-codename instead of stable in the examples (Closes: #531492)
* doc/apt_preferences.5.xml:
- adapt some examples here to use current codenames as well
+ - add "NotAutomatic: yes" handling, thanks Osamu Aoki (Closes: #490347)
[ Jari Aalto ]
* debian/rules:
diff --git a/doc/apt_preferences.5.xml b/doc/apt_preferences.5.xml
index 5f8f9fded..abcf56744 100644
--- a/doc/apt_preferences.5.xml
+++ b/doc/apt_preferences.5.xml
@@ -98,6 +98,12 @@ algorithm to set the priorities of the versions of a package. Assign:
<variablelist>
<varlistentry>
+<term>priority 1</term>
+<listitem><simpara>to the versions coming from archives which in their <filename>Release</filename>
+files are marked as "NotAutomatic: yes" like the debian experimental archive.</simpara></listitem>
+</varlistentry>
+
+<varlistentry>
<term>priority 100</term>
<listitem><simpara>to the version that is already installed (if any).</simpara></listitem>
</varlistentry>
@@ -116,7 +122,9 @@ algorithm to set the priorities of the versions of a package. Assign:
<para>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.</para>
+uninstalled package versions, expect versions coming from archives which
+in their <filename>Release</filename> files are marked as "NotAutomatic: yes" -
+these versions get the priority 1.</para>
<para>APT then applies the following rules, listed in order of precedence,
to determine which version of a package to install.