diff options
| author | Martin Pitt <martin@piware.de> | 2010-10-13 14:22:29 +0200 |
|---|---|---|
| committer | Martin Pitt <martin@piware.de> | 2010-10-13 14:22:29 +0200 |
| commit | eff581c2d4740bc439522e44538fd6f7f4069e06 (patch) | |
| tree | 1ae241ddb802d596cf5fda083d6eb38f93ecb34d | |
| parent | 9c182afa045dc889a5025d166328c6115924d706 (diff) | |
| parent | ea38b1e608db857d4845b7bf6275b2df1fb8c9e7 (diff) | |
merge from trunk
| -rw-r--r-- | apt-pkg/deb/debsystem.cc | 4 | ||||
| -rw-r--r-- | debian/apt.cron.daily | 7 | ||||
| -rw-r--r-- | debian/changelog | 10 | ||||
| -rw-r--r-- | doc/examples/configure-index | 1 | ||||
| -rw-r--r-- | test/integration/framework | 2 |
5 files changed, 22 insertions, 2 deletions
diff --git a/apt-pkg/deb/debsystem.cc b/apt-pkg/deb/debsystem.cc index ab08a8f4d..8619822df 100644 --- a/apt-pkg/deb/debsystem.cc +++ b/apt-pkg/deb/debsystem.cc @@ -164,8 +164,8 @@ 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::status", Cnf.FindDir("Dir", "/").append("var/lib/dpkg/status")); + 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"); if (StatusFile) { diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily index 8ace14a31..c61bfb9bb 100644 --- a/debian/apt.cron.daily +++ b/debian/apt.cron.daily @@ -417,6 +417,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 LANGUAGE LC_MESSAGES LC_ALL +fi + # update package lists UPDATED=0 UPDATE_STAMP=/var/lib/apt/periodic/update-stamp diff --git a/debian/changelog b/debian/changelog index f1737a5a2..3a552d01e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,16 @@ apt (0.8.7) UNRELEASED; urgency=low * Another typo fixed in French ("Anfin"). Thanks to bubulle * Wrong translation for "showauto" fixed. Thanks to Raphaël Hertzog Closes: #599265 + + [ Michael Vogt ] + * debian/apt.cron.daily: + - source /etc/default/locale (if available) so that the + apt-get update cron job fetches the right translated package + descriptions + * fix test failure on amd64 + * apt-pkg/deb/debsystem.cc: + - fix issues with dir::state::status and dir::state::extended_states + when alternative rootdirs are used [ Martin Pitt ] * apt-pkg/deb/debindexfile.cc: 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 diff --git a/test/integration/framework b/test/integration/framework index c09afcbad..e2c5234e2 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 |