diff options
| author | Michael Vogt <mvo@debian.org> | 2010-10-13 13:38:13 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2010-10-13 13:38:13 +0200 |
| commit | 0497fc4c09c434ea34aa4dbfe773451d9a7082d6 (patch) | |
| tree | 334b8273078636f0341d3dd24f1ab3b39a1ead4a | |
| parent | 3a97e9665d126a582c830376bfded145c0f9b2d1 (diff) | |
| parent | 4b2a4ab8abb9f9b6ce262882480eee945a041d14 (diff) | |
* 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
| -rw-r--r-- | debian/apt.cron.daily | 7 | ||||
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | doc/examples/configure-index | 1 | ||||
| -rw-r--r-- | test/integration/framework | 2 |
4 files changed, 17 insertions, 0 deletions
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 e7d784eb8..50e18d3cf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,13 @@ 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 -- Christian Perrier <bubulle@debian.org> Tue, 05 Oct 2010 05:35:58 +0200 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 |