From a8cabc8f40152cc6ca208fe92d56ccbb885abe20 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Fri, 3 Oct 2008 20:25:06 +0200 Subject: * Document apt-key finger and adv commands (thanks to Stefan Schmidt, closes: #350575) --- cmdline/apt-key | 2 ++ 1 file changed, 2 insertions(+) (limited to 'cmdline') diff --git a/cmdline/apt-key b/cmdline/apt-key index 3f886987e..51a0bc2d1 100755 --- a/cmdline/apt-key +++ b/cmdline/apt-key @@ -114,6 +114,8 @@ usage() { echo " apt-key update - update keys using the keyring package" echo " apt-key net-update - update keys using the network" echo " apt-key list - list keys" + echo " apt-key finger - list fingerprints" + echo " apt-key adv - pass advanced options to gpg (download key)" echo } -- cgit v1.2.3 From 8cd53bd4fe839c3135696ecbdca45909130a2dd9 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sat, 11 Oct 2008 10:00:50 +0200 Subject: * Compilation fixes and portability improvement for compiling APT against non-GNU libc --- cmdline/makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'cmdline') diff --git a/cmdline/makefile b/cmdline/makefile index 5820c2e0f..3260e375b 100644 --- a/cmdline/makefile +++ b/cmdline/makefile @@ -7,42 +7,42 @@ include ../buildlib/defaults.mak # The apt-cache program PROGRAM=apt-cache -SLIBS = -lapt-pkg +SLIBS = -lapt-pkg $(INTLLIBS) LIB_MAKES = apt-pkg/makefile SOURCE = apt-cache.cc include $(PROGRAM_H) # The apt-get program PROGRAM=apt-get -SLIBS = -lapt-pkg -lutil +SLIBS = -lapt-pkg -lutil $(INTLLIBS) LIB_MAKES = apt-pkg/makefile SOURCE = apt-get.cc acqprogress.cc include $(PROGRAM_H) # The apt-config program PROGRAM=apt-config -SLIBS = -lapt-pkg +SLIBS = -lapt-pkg $(INTLLIBS) LIB_MAKES = apt-pkg/makefile SOURCE = apt-config.cc include $(PROGRAM_H) # The apt-cdrom program PROGRAM=apt-cdrom -SLIBS = -lapt-pkg +SLIBS = -lapt-pkg $(INTLLIBS) LIB_MAKES = apt-pkg/makefile SOURCE = apt-cdrom.cc include $(PROGRAM_H) # The apt-sortpkgs program PROGRAM=apt-sortpkgs -SLIBS = -lapt-pkg +SLIBS = -lapt-pkg $(INTLLIBS) LIB_MAKES = apt-pkg/makefile SOURCE = apt-sortpkgs.cc include $(PROGRAM_H) # The apt-extracttemplates program PROGRAM=apt-extracttemplates -SLIBS = -lapt-pkg -lapt-inst +SLIBS = -lapt-pkg -lapt-inst $(INTLLIBS) LIB_MAKES = apt-pkg/makefile SOURCE = apt-extracttemplates.cc include $(PROGRAM_H) -- cgit v1.2.3 From 3c8cda8b05d6eeaef76c7ccc673fe378b0c74f37 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 28 Oct 2008 18:14:29 +0100 Subject: fix various -Wall warnings --- cmdline/apt-cache.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cmdline') diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index f10ea48be..5513fcc90 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -1272,7 +1272,7 @@ bool DisplayRecord(pkgCache::VerIterator V) /*}}}*/ // Search - Perform a search /*{{{*/ // --------------------------------------------------------------------- -/* This searches the package names and pacakge descriptions for a pattern */ +/* This searches the package names and package descriptions for a pattern */ struct ExDescFile { pkgCache::DescFile *Df; -- cgit v1.2.3 From 94cb04ddd1f9221e16680dceb98afad6a1273c50 Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Wed, 29 Oct 2008 22:01:52 +0200 Subject: Fixed bashisms in apt-key. --- cmdline/apt-key | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'cmdline') diff --git a/cmdline/apt-key b/cmdline/apt-key index 51a0bc2d1..94c11497c 100755 --- a/cmdline/apt-key +++ b/cmdline/apt-key @@ -60,16 +60,16 @@ net_update() { if [ ! -d /var/lib/apt/keyrings ]; then mkdir -p /var/lib/apt/keyrings fi - keyring=/var/lib/apt/keyrings/$(basename $ARCHIVE_KEYRING) + keyring=/var/lib/apt/keyrings/`basename $ARCHIVE_KEYRING` old_mtime=0 if [ -e $keyring ]; then - old_mtime=$(stat -c %Y $keyring) + old_mtime=`stat -c %Y $keyring` fi (cd /var/lib/apt/keyrings; wget -q -N $ARCHIVE_KEYRING_URI) if [ ! -e $keyring ]; then return fi - new_mtime=$(stat -c %Y $keyring) + new_mtime=`stat -c %Y $keyring` if [ $new_mtime -ne $old_mtime ]; then echo "Checking for new archive signing keys now" add_keys_with_verify_against_master_keyring $keyring $MASTER_KEYRING -- cgit v1.2.3 From 20ba2505a3a2e9f2c526800d154270edce22d78f Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Fri, 31 Oct 2008 20:24:05 +0200 Subject: Reverted 'bashisms' commit, it was wrong as $(...) is not a bashism. --- cmdline/apt-key | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'cmdline') diff --git a/cmdline/apt-key b/cmdline/apt-key index 94c11497c..51a0bc2d1 100755 --- a/cmdline/apt-key +++ b/cmdline/apt-key @@ -60,16 +60,16 @@ net_update() { if [ ! -d /var/lib/apt/keyrings ]; then mkdir -p /var/lib/apt/keyrings fi - keyring=/var/lib/apt/keyrings/`basename $ARCHIVE_KEYRING` + keyring=/var/lib/apt/keyrings/$(basename $ARCHIVE_KEYRING) old_mtime=0 if [ -e $keyring ]; then - old_mtime=`stat -c %Y $keyring` + old_mtime=$(stat -c %Y $keyring) fi (cd /var/lib/apt/keyrings; wget -q -N $ARCHIVE_KEYRING_URI) if [ ! -e $keyring ]; then return fi - new_mtime=`stat -c %Y $keyring` + new_mtime=$(stat -c %Y $keyring) if [ $new_mtime -ne $old_mtime ]; then echo "Checking for new archive signing keys now" add_keys_with_verify_against_master_keyring $keyring $MASTER_KEYRING -- cgit v1.2.3 From dac074b0ad8925ea542edea8ffd113736364344e Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Fri, 31 Oct 2008 21:21:18 +0200 Subject: Added 'unset GREP_OPTIONS' to apt-key. --- cmdline/apt-key | 1 + 1 file changed, 1 insertion(+) (limited to 'cmdline') diff --git a/cmdline/apt-key b/cmdline/apt-key index 51a0bc2d1..7bb30240e 100755 --- a/cmdline/apt-key +++ b/cmdline/apt-key @@ -1,6 +1,7 @@ #!/bin/sh set -e +unset GREP_OPTIONS # We don't use a secret keyring, of course, but gpg panics and # implodes if there isn't one available -- cgit v1.2.3 From 2c120e24097b1f495658d5b06c62dfe19028b6da Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Sat, 8 Nov 2008 21:11:14 +0200 Subject: Re-applied apt-cache built-in help fixes. --- cmdline/apt-cache.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cmdline') diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index 5513fcc90..4431fd4f9 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -1739,8 +1739,8 @@ bool ShowHelp(CommandLine &Cmd) " show - Show a readable record for the package\n" " depends - Show raw dependency information for a package\n" " rdepends - Show reverse dependency information for a package\n" - " pkgnames - List the names of all packages\n" - " dotty - Generate package graphs for GraphVis\n" + " pkgnames - List the names of all packages in the system\n" + " dotty - Generate package graphs for GraphViz\n" " xvcg - Generate package graphs for xvcg\n" " policy - Show policy settings\n" "\n" -- cgit v1.2.3 From ecd414ef61a325e8596e6a541696e350cb956753 Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Tue, 11 Nov 2008 21:47:04 +0200 Subject: Removed asking to file a release-critical bug against a package if there is a request to install only one package and it is not installable. --- cmdline/apt-get.cc | 2 ++ 1 file changed, 2 insertions(+) (limited to 'cmdline') diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 104baba8a..5fbe21eed 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1721,6 +1721,7 @@ bool DoInstall(CommandLine &CmdL) "requested an impossible situation or if you are using the unstable\n" "distribution that some required packages have not yet been created\n" "or been moved out of Incoming.") << endl; + /* if (Packages == 1) { c1out << endl; @@ -1729,6 +1730,7 @@ bool DoInstall(CommandLine &CmdL) "the package is simply not installable and a bug report against\n" "that package should be filed.") << endl; } + */ c1out << _("The following information may help to resolve the situation:") << endl; c1out << endl; -- cgit v1.2.3