diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2007-11-28 16:46:46 +0100 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2007-11-28 16:46:46 +0100 |
| commit | ac3dee0e5091f19b77de96eec5241cb57c13f2a1 (patch) | |
| tree | 2a82dd1c7a487f830bc4ec569c9f4e3775ddf4e8 /cmdline | |
| parent | 318dd26ac9bdbb30bcd22201393dc73d8566b3cf (diff) | |
| parent | 757f20941a19d5e1e9ebd74ecd5a4d5b0012644f (diff) | |
merge with the debian tree
Diffstat (limited to 'cmdline')
| -rw-r--r-- | cmdline/apt-extracttemplates.cc | 2 | ||||
| -rw-r--r-- | cmdline/apt-get.cc | 2 | ||||
| -rwxr-xr-x | cmdline/apt-key | 8 |
3 files changed, 11 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-get.cc b/cmdline/apt-get.cc index 2cd2516bd..b619a45c5 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -2671,6 +2671,7 @@ bool ShowHelp(CommandLine &CmdL) " upgrade - Perform an upgrade\n" " install - Install new packages (pkg is libc6 not libc6.deb)\n" " remove - Remove packages\n" + " autoremove - Remove all automatic unused packages\n" " purge - Remove and purge packages\n" " source - Download source archives\n" " build-dep - Configure build-dependencies for source packages\n" @@ -2781,6 +2782,7 @@ int main(int argc,const char *argv[]) {"upgrade",&DoUpgrade}, {"install",&DoInstall}, {"remove",&DoInstall}, + {"purge",&DoInstall}, {"autoremove",&DoInstall}, {"purge",&DoInstall}, {"dist-upgrade",&DoDistUpgrade}, diff --git a/cmdline/apt-key b/cmdline/apt-key index 7c1aad0cf..15cc4427c 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 $* |