summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorDavid Kalnischkies <kalnischkies@gmail.com>2011-01-26 16:19:30 +0100
committerDavid Kalnischkies <kalnischkies@gmail.com>2011-01-26 16:19:30 +0100
commit5d88572318ed7e271101b1ae8f2cc139a1a3f705 (patch)
treed6185078bc008b9d300692c554f8aac27e9e3c73 /doc
parent18331adf730dca4a587f99605edff71436379ea6 (diff)
- change the internal handling of Extensions in pkgAcqIndex
- add a special uncompressed compression type to prefer those files * methods/{gzip,bzip}.cc: - print a good error message if FileSize() is zero
Diffstat (limited to 'doc')
-rw-r--r--doc/apt.conf.5.xml9
-rw-r--r--doc/examples/configure-index2
2 files changed, 5 insertions, 6 deletions
diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml
index a19d85dbc..a423dac24 100644
--- a/doc/apt.conf.5.xml
+++ b/doc/apt.conf.5.xml
@@ -442,12 +442,11 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
the bzip2 method (the inbuilt) setting is <literallayout>Dir::Bin::bzip2 "/bin/bzip2";</literallayout>
Note also that list entries specified on the command line will be added at the end of the list
specified in the configuration files, but before the default entries. To prefer a type in this case
- over the ones specified in in the configuration files you can set the option direct - not in list style.
+ over the ones specified in the configuration files you can set the option direct - not in list style.
This will not override the defined list, it will only prefix the list with this type.</para>
- <para>While it is possible to add an empty compression type to the order list, but APT in its current
- version doesn't understand it correctly and will display many warnings about not downloaded files -
- these warnings are most of the time false negatives. Future versions will maybe include a way to
- really prefer uncompressed files to support the usage of local mirrors.</para></listitem>
+ <para>The special type <literal>uncompressed</literal> can be used to give uncompressed files a
+ preference, but note that most archives doesn't provide uncompressed files so this is mostly only
+ useable for local mirrors.</para></listitem>
</varlistentry>
<varlistentry><term>GzipIndexes</term>
diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index 6c078d75f..fd14d4dd7 100644
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -281,7 +281,7 @@ Acquire
lzma "lzma";
gz "gzip";
- Order { "gz"; "lzma"; "bz2"; };
+ Order { "uncompressed"; "gz"; "lzma"; "bz2"; };
};
Languages