summaryrefslogtreecommitdiff
path: root/cmdline
diff options
context:
space:
mode:
authorMatt Zimmerman <matt.zimmerman@canonical.com>2004-12-14 13:25:29 +0000
committerMatt Zimmerman <matt.zimmerman@canonical.com>2004-12-14 13:25:29 +0000
commit4a1778448653283970ea094822738ddbed8f7825 (patch)
tree8075a7a6fed5079af1054df349e7c387017133f7 /cmdline
parent3826564e07eaffb05eca5af34a0e76f6f161b89c (diff)
Merge from mvo
Patches applied: * michael.vogt@canonical.com--2004--laptop/apt--authentication-mvo--0--patch-2 * ignore errors when a Packages.bz2/Sources.bz2 can't be found and try with Packages.gz/Sources.gz again * michael.vogt@canonical.com--2004--laptop/apt--mvo--0--base-0 tag of apt@packages.debian.org/apt--main--0--patch-34 * michael.vogt@canonical.com--2004--laptop/apt--mvo--0--patch-1 * merged matt's tree (with all those apt-authentication changes) * michael.vogt@canonical.com--2004--laptop/apt--mvo--0--patch-2 don't display a error if a bzip2 package can not be downloaded, just ignore (Ign) it * michael.vogt@canonical.com--2004--laptop/apt--mvo--0--patch-3 * "chmod 755 cmdline/apt-key", changed version to 0.6.27ubuntu1 * michael.vogt@canonical.com--2004--laptop/apt--mvo--0--patch-4 * fix for a stupid merge error (from 0.5->0.6) * michael.vogt@canonical.com--2004--laptop/apt--mvo--0--patch-5 * unstable should really be hoary
Diffstat (limited to 'cmdline')
-rwxr-xr-x[-rw-r--r--]cmdline/apt-key0
1 files changed, 0 insertions, 0 deletions
diff --git a/cmdline/apt-key b/cmdline/apt-key
index 583cde191..583cde191 100644..100755
--- a/cmdline/apt-key
+++ b/cmdline/apt-key