diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2007-10-03 02:06:37 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2007-10-03 02:06:37 +0200 |
| commit | 18a14a834e4068917d97467a3a52f17ed6055da3 (patch) | |
| tree | 04001afdb2078ff74813ef4c97a09a4c65cf641b /cmdline | |
| parent | 59d5cc74ef7c6ca820ed9d26a4d829b891214edf (diff) | |
| parent | a491fe600cdcf28ee9515d4fde02345be93a0f9c (diff) | |
- French updated
- Basque updated. Closes: #436425
- Fix the zh_CN translator's name in debian/changelog for 0.7.2
Closes: #423272
- Vietnamese updated. Closes: #440611
- Danish updated. Closes: #441102
- Thai added. Closes: #442833
* Add hash support to copy method. Thanks Anders Kaseorg by the patch
(closes: #436055)
* Reset curl options and timestamp between downloaded files. Thanks to
Ryan Murray <rmurray@debian.org> for the patch (closes: #437150)
* Add support to apt-key to export keys to stdout. Thanks to "Dwayne
C. Litzenberger" <dlitz@dlitz.net> for the patch (closes: #441942)
* Fix compilation warnings:
- apt-pkg/indexfile.cc: conversion from string constant to 'char*';
- apt-pkg/acquire-item.cc: likewise;
- apt-pkg/cdrom.cc: '%lu' expects 'long unsigned int', but argument
has type 'size_t';
- apt-pkg/deb/dpkgpm.cc: initialization order and conversion from
string constant to 'char*';
- methods/gpgv.cc: conversion from string constant to 'char*';
- methods/ftp.cc: likewise;
- cmdline/apt-extracttemplates.cc: likewise;
- apt-pkg/deb/debmetaindex.cc: comparison with string literal results
in unspecified behaviour;
* Applied patch from Aurelien Jarno <aurel32@debian.org> to fix wrong
directory downloading on non-linux architectures (closes: #435597)
* zh_CN.po: Updated by Kov Chai Closes: #416822
Diffstat (limited to 'cmdline')
| -rw-r--r-- | cmdline/apt-extracttemplates.cc | 2 | ||||
| -rwxr-xr-x | cmdline/apt-key | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/cmdline/apt-extracttemplates.cc b/cmdline/apt-extracttemplates.cc index 6d580cc28..de22386b9 100644 --- a/cmdline/apt-extracttemplates.cc +++ b/cmdline/apt-extracttemplates.cc @@ -249,7 +249,7 @@ string WriteFile(const char *package, const char *prefix, const char *data) { char fn[512]; static int i; - char *tempdir = NULL; + const char *tempdir = NULL; tempdir = getenv("TMPDIR"); if (tempdir == NULL) diff --git a/cmdline/apt-key b/cmdline/apt-key index 90ecae2cf..3bd1a92d9 100755 --- a/cmdline/apt-key +++ b/cmdline/apt-key @@ -39,6 +39,8 @@ usage() { echo echo " apt-key add <file> - add the key contained in <file> ('-' for stdin)" echo " apt-key del <keyid> - remove the key <keyid>" + echo " apt-key export <keyid> - output the key <keyid>" + echo " apt-key exportall - output all trusted keys" echo " apt-key update - update keys using the keyring package" echo " apt-key list - list keys" echo @@ -75,6 +77,12 @@ case "$command" in finger*) $GPG --batch --fingerprint ;; + export) + $GPG --armor --export "$1" + ;; + exportall) + $GPG --armor --export + ;; adv*) echo "Executing: $GPG $*" $GPG $* |