From 0c6b381f7b61bffc36e462005945027adfc43295 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 21 Sep 2010 13:23:21 +0200 Subject: doc/examples/configure-index: - add info on debug::acquire::cdrom --- doc/examples/configure-index | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/examples/configure-index b/doc/examples/configure-index index 26fb53fec..c4c2acb64 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -433,6 +433,7 @@ Debug Acquire::Http "false"; // Show http command traffic Acquire::Https "false"; // Show https debug Acquire::gpgv "false"; // Show the gpgv traffic + Acquire::cdrom "false"; // Show cdrom debug output aptcdrom "false"; // Show found package files IdentCdrom "false"; acquire::netrc "false"; // netrc parser -- cgit v1.2.3 From 966a4c5320a8d7a76749c2ddbfc29708d71bda3c Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 1 Oct 2010 14:36:31 +0200 Subject: * debian/apt.cron.daily: - source /etc/default/locale (if available) so that the apt-get update cron job fetches the right translated package descriptions --- debian/apt.cron.daily | 7 +++++++ debian/changelog | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily index 8c0e4c416..40be6e55d 100644 --- a/debian/apt.cron.daily +++ b/debian/apt.cron.daily @@ -430,6 +430,13 @@ do_cache_backup $BackupArchiveInterval # mirrors at the same time random_sleep +# include default system language so that "apt-get update" will +# fetch the right translated package descriptions +if [ -r /etc/default/locale ]; then + . /etc/default/locale + export LANG +fi + # update package lists UPDATED=0 UPDATE_STAMP=/var/lib/apt/periodic/update-stamp diff --git a/debian/changelog b/debian/changelog index f1976f516..feafede86 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,10 @@ apt (0.8.2) unstable; urgency=low not use the root directory to identify the medium (as all changes there change the ident id). Use the .disk directory instead + * debian/apt.cron.daily: + - source /etc/default/locale (if available) so that the + apt-get update cron job fetches the right translated package + descriptions -- Michael Vogt Fri, 03 Sep 2010 20:21:43 +0200 -- cgit v1.2.3 From 6e2398300f16741d028a022ddf73c72403728d0c Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 1 Oct 2010 15:02:14 +0200 Subject: debian/apt.cron.daily: export LANGUAGE LC_MESSAGES LC_ALL as well --- debian/apt.cron.daily | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily index 40be6e55d..3da279c13 100644 --- a/debian/apt.cron.daily +++ b/debian/apt.cron.daily @@ -434,7 +434,7 @@ random_sleep # fetch the right translated package descriptions if [ -r /etc/default/locale ]; then . /etc/default/locale - export LANG + export LANG LANGUAGE LC_MESSAGES LC_ALL fi # update package lists -- cgit v1.2.3 From 4b2a4ab8abb9f9b6ce262882480eee945a041d14 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 13 Oct 2010 12:23:25 +0200 Subject: merge fix for testrun on amd64 --- test/integration/framework | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/integration/framework b/test/integration/framework index d832bedbe..95fce1247 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -64,6 +64,8 @@ runapt() { msgdebug "Executing: ${CCMD}$*${CDEBUG} " if [ -f ./aptconfig.conf ]; then APT_CONFIG=aptconfig.conf LD_LIBRARY_PATH=${BUILDDIRECTORY} ${BUILDDIRECTORY}/$* + elif [ -f ../aptconfig.conf ]; then + APT_CONFIG=../aptconfig.conf LD_LIBRARY_PATH=${BUILDDIRECTORY} ${BUILDDIRECTORY}/$* else LD_LIBRARY_PATH=${BUILDDIRECTORY} ${BUILDDIRECTORY}/$* fi -- cgit v1.2.3 From c988fe215ba08bd2163024d9b1d27b76a9c59696 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 13 Oct 2010 14:08:52 +0200 Subject: * revert commit: * apt-pkg/deb/debsystem.cc: - set dir::state::status based at least on dir This causes problems with alternative rootdirs --- apt-pkg/deb/debsystem.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apt-pkg/deb/debsystem.cc b/apt-pkg/deb/debsystem.cc index ab08a8f4d..7056d771d 100644 --- a/apt-pkg/deb/debsystem.cc +++ b/apt-pkg/deb/debsystem.cc @@ -165,7 +165,7 @@ bool debSystem::Initialize(Configuration &Cnf) which is yet to be determined. The functions in pkgcachegen should be the only users of these */ Cnf.CndSet("Dir::State::extended_states", Cnf.FindDir("Dir::State").append("extended_states")); - Cnf.CndSet("Dir::State::status", Cnf.FindDir("Dir", "/").append("var/lib/dpkg/status")); + Cnf.CndSet("Dir::State::status","/var/lib/dpkg/status"); Cnf.CndSet("Dir::Bin::dpkg","/usr/bin/dpkg"); if (StatusFile) { -- cgit v1.2.3 From 940ff5d6b5634b57c2e622b5295f499a7807f3de Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 13 Oct 2010 14:11:57 +0200 Subject: apt-pkg/deb/debsystem.cc: remove duplicated rootdir (FindFile will prepend the rootdir later anyway) --- apt-pkg/deb/debsystem.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apt-pkg/deb/debsystem.cc b/apt-pkg/deb/debsystem.cc index 7056d771d..8619822df 100644 --- a/apt-pkg/deb/debsystem.cc +++ b/apt-pkg/deb/debsystem.cc @@ -164,7 +164,7 @@ bool debSystem::Initialize(Configuration &Cnf) /* These really should be jammed into a generic 'Local Database' engine which is yet to be determined. The functions in pkgcachegen should be the only users of these */ - Cnf.CndSet("Dir::State::extended_states", Cnf.FindDir("Dir::State").append("extended_states")); + Cnf.CndSet("Dir::State::extended_states", "extended_states"); Cnf.CndSet("Dir::State::status","/var/lib/dpkg/status"); Cnf.CndSet("Dir::Bin::dpkg","/usr/bin/dpkg"); -- cgit v1.2.3