Sfoglia il codice sorgente

add "NotAutomatic: yes" handling, thanks Osamu Aoki (Closes: #490347)

David Kalnischkies 16 anni fa
parent
commit
10df254bd7
2 ha cambiato i file con 10 aggiunte e 1 eliminazioni
  1. 1 0
      debian/changelog
  2. 9 1
      doc/apt_preferences.5.xml

+ 1 - 0
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)
     - use stable-codename instead of stable in the examples (Closes: #531492)
   * doc/apt_preferences.5.xml:
   * doc/apt_preferences.5.xml:
     - adapt some examples here to use current codenames as well
     - adapt some examples here to use current codenames as well
+    - add "NotAutomatic: yes" handling, thanks Osamu Aoki (Closes: #490347)
 
 
   [ Jari Aalto ]
   [ Jari Aalto ]
   * debian/rules:
   * debian/rules:

+ 9 - 1
doc/apt_preferences.5.xml

@@ -97,6 +97,12 @@ APT::Default-Release "stable";
 algorithm to set the priorities of the versions of a package.  Assign:
 algorithm to set the priorities of the versions of a package.  Assign:
 
 
 <variablelist>
 <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>
 <varlistentry>
 <term>priority 100</term>
 <term>priority 100</term>
 <listitem><simpara>to the version that is already installed (if any).</simpara></listitem>
 <listitem><simpara>to the version that is already installed (if any).</simpara></listitem>
@@ -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
 <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
 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,
 <para>APT then applies the following rules, listed in order of precedence,
 to determine which version of a package to install.
 to determine which version of a package to install.