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-70-g09d2 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 +++--- debian/changelog | 2 ++ 2 files changed, 5 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 diff --git a/debian/changelog b/debian/changelog index 40e1cc23d..dedb574b8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ apt (0.7.17) unstable; urgency=low * apt-pkg/algorithm.cc: - Strip username and password from source URL in error message. (Closes: #425150) + * cmdline/apt-key: + - Fixed bashisms; -- Eugene V. Lyubimkin Fri, 24 Oct 2008 23:45:17 +0300 -- cgit v1.2.3-70-g09d2 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 +++--- debian/changelog | 2 -- 2 files changed, 3 insertions(+), 5 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 diff --git a/debian/changelog b/debian/changelog index 9a86b3fa5..c6b7b170c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,8 +7,6 @@ apt (0.7.17) unstable; urgency=low * apt-pkg/algorithm.cc: - Strip username and password from source URL in error message. (Closes: #425150) - * cmdline/apt-key: - - Fixed bashisms; * debian/rules: - Fixed lintian warnings "debian/rules ignores make errors". * debian/control: -- cgit v1.2.3-70-g09d2 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 + debian/changelog | 4 ++++ 2 files changed, 5 insertions(+) (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 diff --git a/debian/changelog b/debian/changelog index 625dd8e0b..beef99123 100644 --- a/debian/changelog +++ b/debian/changelog @@ -26,6 +26,10 @@ apt (0.7.17) unstable; urgency=low - Added with override of 'apt must depend on python'. Script 'apt-mark' needs apt-python for working and checks this on fly. We don't want python in most cases. + * cmdline/apt-key: + - Added 'unset GREP_OPTIONS' to the script. This prevents 'apt-key update' + failure when GREP_OPTIONS contains options that modify grep output. + (Closes: #428752) -- Eugene V. Lyubimkin Fri, 24 Oct 2008 23:45:17 +0300 -- cgit v1.2.3-70-g09d2 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 ++-- debian/changelog | 3 +++ po/apt-all.pot | 18 +++++++++--------- 3 files changed, 14 insertions(+), 11 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" diff --git a/debian/changelog b/debian/changelog index 5ff981df6..e04716224 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,9 @@ apt (0.7.19) unstable; urgency=low Thanks to Matthias Urlichs. (Closes: #426913) * doc/apt-get.8.xml: - Included '-v'/'--version' as a command to synopsis. + * cmdline/apt-cache.cc: + - Advanced built-in help. Patch by Andre Felipe Machado. (Closes: #286061) + - Fixed typo 'GraphVis' -> 'GraphViz'. (Closes: #349038) -- Eugene V. Lyubimkin Sat, 08 Nov 2008 12:40:19 +0200 diff --git a/po/apt-all.pot b/po/apt-all.pot index 19e57536a..518aabcd3 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-10-28 18:12+0100\n" +"POT-Creation-Date: 2008-11-08 21:08+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -184,8 +184,8 @@ msgid "" " 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" @@ -2449,35 +2449,35 @@ msgstr "" msgid "MD5Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:658 apt-pkg/acquire-item.cc:1421 +#: apt-pkg/acquire-item.cc:658 apt-pkg/acquire-item.cc:1426 msgid "Hash Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:1113 +#: apt-pkg/acquire-item.cc:1118 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1226 +#: apt-pkg/acquire-item.cc:1231 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "" -#: apt-pkg/acquire-item.cc:1285 +#: apt-pkg/acquire-item.cc:1290 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "" -#: apt-pkg/acquire-item.cc:1326 +#: apt-pkg/acquire-item.cc:1331 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/acquire-item.cc:1413 +#: apt-pkg/acquire-item.cc:1418 msgid "Size mismatch" msgstr "" -- cgit v1.2.3-70-g09d2 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 ++ debian/changelog | 3 +++ 2 files changed, 5 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; diff --git a/debian/changelog b/debian/changelog index e04716224..4f12c563e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,9 @@ apt (0.7.19) unstable; urgency=low * cmdline/apt-cache.cc: - Advanced built-in help. Patch by Andre Felipe Machado. (Closes: #286061) - Fixed typo 'GraphVis' -> 'GraphViz'. (Closes: #349038) + - 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. + (Closes: #419521) -- Eugene V. Lyubimkin Sat, 08 Nov 2008 12:40:19 +0200 -- cgit v1.2.3-70-g09d2 From d59228b0656483be9b60aa9d5e7b4759bf9e6b15 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 2 Dec 2008 20:54:43 +0100 Subject: make "apt-get build-dep" installed packages marked automatic by default. This can be changed by setting the value of APT::Get::Build-Dep-Automatic to false (thanks to Aaron Haviland, closes: #44874, LP: #248268) --- cmdline/apt-get.cc | 3 +++ configure.in | 2 +- debian/changelog | 10 ++++++++-- doc/examples/configure-index | 1 + 4 files changed, 13 insertions(+), 3 deletions(-) (limited to 'cmdline') diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 5fbe21eed..43f8ec8b8 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -2515,6 +2515,8 @@ bool DoBuildDep(CommandLine &CmdL) { // We successfully installed something; skip remaining alternatives skipAlternatives = hasAlternatives; + if(_config->FindB("APT::Get::Build-Dep-Automatic", false) == true) + Cache->MarkAuto(Pkg, true); continue; } else if (hasAlternatives) @@ -2730,6 +2732,7 @@ int main(int argc,const char *argv[]) {0,"only-source","APT::Get::Only-Source",0}, {0,"arch-only","APT::Get::Arch-Only",0}, {0,"auto-remove","APT::Get::AutomaticRemove",0}, + {0,"build-dep-automatic","APT::Get::Build-Dep-Automatic",0}, {0,"allow-unauthenticated","APT::Get::AllowUnauthenticated",0}, {0,"install-recommends","APT::Install-Recommends",CommandLine::Boolean}, {0,"fix-policy","APT::Get::Fix-Policy-Broken",0}, diff --git a/configure.in b/configure.in index 0ffbc67ff..f90a32c3b 100644 --- a/configure.in +++ b/configure.in @@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib) AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) dnl -- SET THIS TO THE RELEASE VERSION -- -AC_DEFINE_UNQUOTED(VERSION,"0.7.18") +AC_DEFINE_UNQUOTED(VERSION,"0.7.20~exp3") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --git a/debian/changelog b/debian/changelog index d1ccf8b8f..325804f84 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,10 @@ -apt (0.7.20~exp2) unstable; urgency=low +apt (0.7.20~exp3) unstable; urgency=low + + [ Michael Vogt ] + * make "apt-get build-dep" installed packages marked automatic + by default. This can be changed by setting the value of + APT::Get::Build-Dep-Automatic to false (thanks to Aaron + Haviland, closes: #44874, LP: #248268) [ Eugene V. Lyubimkin ] * doc/examples/sources.list: @@ -8,7 +14,7 @@ apt (0.7.20~exp2) unstable; urgency=low - Added instruction how to work around MMap error in MMap error message. (Closes: #385674, 436028) - -- Eugene V. Lyubimkin Wed, 26 Nov 2008 22:06:21 +0200 + -- Michael Vogt Tue, 02 Dec 2008 20:30:14 +0100 apt (0.7.19) unstable; urgency=low diff --git a/doc/examples/configure-index b/doc/examples/configure-index index 07803b2cb..db07f189e 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -54,6 +54,7 @@ APT Only-Source ""; Diff-Only "false"; Tar-Only "false"; + Build-Dep-Automatic "true"; }; Cache -- cgit v1.2.3-70-g09d2