From: Michael Vogt Date: Wed, 13 Oct 2010 11:38:13 +0000 (+0200) Subject: * debian/apt.cron.daily: X-Git-Tag: 0.8.7~10 X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/0497fc4c09c434ea34aa4dbfe773451d9a7082d6?hp=-c * 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 --- 0497fc4c09c434ea34aa4dbfe773451d9a7082d6 diff --combined debian/apt.cron.daily index 8ace14a31,3da279c13..c61bfb9bb --- a/debian/apt.cron.daily +++ b/debian/apt.cron.daily @@@ -11,7 -11,7 +11,7 @@@ # Dir::Cache "var/apt/cache/"; # - Set apt package cache directory # -# Dir::Cache::Archive "archives/"; +# Dir::Cache::Archives "archives/"; # - Set package archive directory # # APT::Periodic::Enable "1"; @@@ -147,14 -147,21 +147,14 @@@ check_size_constraints( eval $(apt-config shell MaxSize APT::Archives::MaxSize) eval $(apt-config shell MaxSize APT::Periodic::MaxSize) - CacheDir="var/cache/apt/" - eval $(apt-config shell CacheDir Dir::Cache) - CacheDir=${CacheDir%/} - - CacheArchive="archives/" - eval $(apt-config shell CacheArchive Dir::Cache::archives) - CacheArchive=${CacheArchive%/} + Cache="/var/cache/apt/archives/" + eval $(apt-config shell Cache Dir::Cache::archives/d) # sanity check - if [ -z "$CacheDir" -o -z "$CacheArchive" ]; then - echo "empty Dir::Cache or Dir::Cache::archives, exiting" + if [ -z "$Cache" ]; then + echo "empty Dir::Cache::archives, exiting" exit fi - - Cache="${Dir%/}/${CacheDir%/}/${CacheArchive%/}/" # check age if [ ! $MaxAge -eq 0 ] && [ ! $MinAge -eq 0 ]; then @@@ -218,17 -225,22 +218,17 @@@ do_cache_backup( fi # Set default values and normalize - Dir="/" - eval $(apt-config shell Dir Dir) - Dir=${Dir%/} - - CacheDir="var/cache/apt/" - eval $(apt-config shell CacheDir Dir::Cache) + CacheDir="/var/cache/apt" + eval $(apt-config shell CacheDir Dir::Cache/d) CacheDir=${CacheDir%/} if [ -z "$CacheDir" ]; then debug_echo "practically empty Dir::Cache, exiting" return 0 fi - CacheArchive="archives/" - eval $(apt-config shell CacheArchive Dir::Cache::Archives) - CacheArchive=${CacheArchive%/} - if [ -z "$CacheArchive" ]; then + Cache="${CacheDir}/archives/" + eval $(apt-config shell Cache Dir::Cache::Archives/d) + if [ -z "$Cache" ]; then debug_echo "practically empty Dir::Cache::archives, exiting" return 0 fi @@@ -239,15 -251,16 +239,15 @@@ BackupLevel=2 ; fi - CacheBackup="backup/" - eval $(apt-config shell CacheBackup Dir::Cache::Backup) - CacheBackup=${CacheBackup%/} - if [ -z "$CacheBackup" ]; then + Back="${CacheDir}/backup/" + eval $(apt-config shell Back Dir::Cache::Backup/d) + if [ -z "$Back" ]; then echo "practically empty Dir::Cache::Backup, exiting" 1>&2 return fi - Cache="${Dir}/${CacheDir}/${CacheArchive}/" - Back="${Dir}/${CacheDir}/${CacheBackup}/" + CacheArchive="$(basename "${Cache}")" + test -n "${CacheArchive}" || CacheArchive="archives" BackX="${Back}${CacheArchive}/" for x in $(seq 0 1 $((${BackupLevel}-1))); do eval "Back${x}=${Back}${x}/" @@@ -417,6 -430,13 +417,13 @@@ do_cache_backup $BackupArchiveInterva # 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 --combined debian/changelog index e7d784eb8,feafede86..50e18d3cf --- a/debian/changelog +++ b/debian/changelog @@@ -1,134 -1,22 +1,141 @@@ -apt (0.8.2) unstable; urgency=low +apt (0.8.7) UNRELEASED; urgency=low - * apt-pkg/indexcopy.cc: - - only use trusted.gpg.d directory if it exists - - do not replace /dev/null when running in APT::CDROM::NoAct - mode (LP: #612666), thanks to Colin Watson + [ Manpages translations ] + * Typo fixed in French (extra "Z"). Thanks to Florentin Duneau. + * 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 Tue, 05 Oct 2010 05:35:58 +0200 + +apt (0.8.6) unstable; urgency=low + + [ Programs translations ] + * Vietnamese update by Clytie Siddall (Closes: #598489) + * Asturian update by Maacub (Closes: #599057) + + [ David Kalnischkies ] + * cmdline/apt-cache.cc: + - use the TranslatedDescription for searching and not the first + available one as it is maybe not an expected language (Closes: #597925) + * apt-pkg/contrib/strutl.cc: + - add a space between number and unit as required by SI (Closes: #598352) + * apt-pkg/depcache.cc: + - do not check endpointer packages instead of only those which prevented + NeverAutoRemove settings from having an effect (Closes: #598452) + - do not remove packages which the user requested for installation + explicitly while satisfying other install requests (Closes: #598669) + * apt-pkg/packagemanager.cc: + - Add a space between period and 'Please' and unfuzzy all translations + * doc/po/de.po: + - remove the duplicated "angefertigt" in translation-holder string + + -- Michael Vogt Mon, 04 Oct 2010 11:52:19 +0200 + +apt (0.8.5) unstable; urgency=low + + [ Manpages translations ] + * German (Chris Leick). Closes: #597163 + + [ Michael Vogt ] + * merged lp:~mvo/apt/conflicts-on-virtuals to better deal with + conflicts/breaks against virtual packages (LP: #614993) + + [ David Kalnischkies ] + * apt-pkg/policy.cc: + - support 100-pinning in Release file with ButAutomaticUpgrades + as requested by the backports crew (Closes: #596097) + * apt-pkg/deb/deblistparser.cc: + - overrule NotAutomatic in case of ButAutomaticUpgrades + * debian/apt.cron.daily: + - handle absolut directory paths correctly by loading directories + directly instead of building the paths on our own (Closes: #596421) + * debian/control: + - build-depend on docbook-xml to ensure that the xml DTDs are always + available on the buildds (Closes: #597145) + * buildlib/debiandoc.mak, buildlib/po4a_manpage.mak: + - ensure that the build fails if documentation building fails + * doc/po/fr.po: + - correct two syntax issues to ensure we can build fine + + -- Michael Vogt Fri, 17 Sep 2010 22:05:06 +0200 + +apt (0.8.4) unstable; urgency=low + + [ Michael vogt ] + * ftparchive/writer.cc: + - write out {Files,Checksum-Sha1,Checksum-Sha256} only if + available LP: #633967. Thanks to Colin Watson * apt-pkg/contrib/cdromutl.cc: - if apt-cdrom is used on writable media (like usb-sticks), do 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 + [ David Kalnischkies ] + * ftparchive/writer.cc: + - null the valid string instead of the date if Valid-Until is not set + * apt-pkg/acquire-item.cc: + - use also unsigned Release files again (Closes: #596189) + + [ Christian Perrier ] + * Fix missing space after dot in a message from apt-pkg + Translations unfuzzied. Thanks to Holger Wansing. + + -- Michael Vogt Fri, 10 Sep 2010 20:45:15 +0200 + +apt (0.8.3) unstable; urgency=low + + [ Programs translations ] + * German (Holger Wansing). Closes: #596141 + + [ Manpages translations ] + * Japanese (KURASAWA Nozomu). Closes: #595862 + + [ Michael Vogt ] + * apt-pkg/indexcopy.cc: + - only use trusted.gpg.d directory if it exists + - do not replace /dev/null when running in APT::CDROM::NoAct + mode (LP: #612666), thanks to Colin Watson + + [ David Kalnischkies ] + * ftparchive/apt-ftparchive.cc: + - ensure that BinDirectory as well as Tree settings get + the correct default FileMode setting (Closes: #595922) + + -- Michael Vogt Tue, 07 Sep 2010 15:28:41 +0200 -apt (0.8.1) UNRELEASED; urgency=low +apt (0.8.2) unstable; urgency=low + + [ Manpages translations ] + * Spanish (Omar Campagne). Closes: #595557 + + [ David Kalnischkies ] + * apt-pkg/versionmatch.cc: + - do not accept 'Pin: origin "' (missing closing ") as a valid + way to pin a local archive: either "" or none… + * apt-pkg/deb/dpkgpm.cc: + - create Dir::Log if needed to support /var/log as tmpfs or similar, + inspired by Thomas Bechtold, thanks! (Closes: #523919, LP: #220239) + * apt-pkg/indexcopy.cc: + - support really still the APT::GPGV::TrustedKeyring setting, + as it breaks d-i badly otherwise (Closes: #595428) + * cmdline/apt-key: + - support also Dir::Etc::Trusted so that apt-key works in the same + way as the library part which works with the trusted files + * methods/{gzip,bzip2}.cc: + - empty files can never be valid archives (Closes: #595691) + + -- Michael Vogt Mon, 06 Sep 2010 18:10:06 +0200 + +apt (0.8.1) unstable; urgency=low [ Programs translations ] * Thai (Theppitak Karoonboonyanan). Closes: #592695 @@@ -142,9 -30,6 +149,9 @@@ * Bulgarian (Damyan Ivanov). Closes: #594627 * Portuguese (Miguel Figueiredo). Closes: #594668 * Korean (Changwoo Ryu). Closes: #594809 + * Norwegian Bokmål (Hans Nordhaug). Closes: #595182 + * Danish (Joe Hansen). Closes: #595176 + * Catalan (Agustí Grau). Closes: #595234 [ Christian Perrier ] * Fix spelling error in cmdline/apt-get.cc. Thanks to Osamu Aoki @@@ -173,8 -58,11 +180,8 @@@ - let the pin origin actually work as advertised in the manpage which means "" are optional and pinning a local archive does work - even if it is a non-flat archive (Closes: #594435) - * apt-pkg/deb/dpkgpm.cc: - - create Dir::Log if needed to support /var/log as tmpfs or similar, - inspired by Thomas Bechtold, thanks! (Closes: #523919, LP: #220239) - -- David Kalnischkies Thu, 02 Sep 2010 12:41:32 +0200 + -- Michael Vogt Fri, 03 Sep 2010 18:36:11 +0200 apt (0.8.0) unstable; urgency=low diff --combined test/integration/framework index c09afcbad,95fce1247..e2c5234e2 --- a/test/integration/framework +++ b/test/integration/framework @@@ -64,6 -64,8 +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 @@@ -72,7 -74,6 +74,7 @@@ aptconfig() { runapt apt-config $*; aptcache() { runapt apt-cache $*; } aptget() { runapt apt-get $*; } aptftparchive() { runapt apt-ftparchive $*; } +aptkey() { runapt apt-key $*; } dpkg() { $(which dpkg) --root=${TMPWORKINGDIRECTORY}/rootdir --force-not-root --force-bad-path --log=${TMPWORKINGDIRECTORY}/rootdir/var/log/dpkg.log $* } @@@ -211,7 -212,7 +213,7 @@@ buildpackage() fi local BUILT="$(dpkg-buildpackage -uc -us -a$ARCH 2> /dev/null)" local PKGS="$( echo "$BUILT" | grep '^dpkg-deb: building package' | cut -d'/' -f 2 | sed -e "s#'\.##")" - local SRCS="$( echo "$BUILT" | grep '^dpkg-source: info: building' | grep -o '[a-z0-9._-]*$')" + local SRCS="$( echo "$BUILT" | grep '^dpkg-source: info: building' | grep -o '[a-z0-9._+~-]*$')" cd - > /dev/null for PKG in $PKGS; do echo "pool/${PKG}" >> ${TMPWORKINGDIRECTORY}/incoming/${RELEASE}.${SECTION}.pkglist @@@ -499,27 -500,3 +501,27 @@@ testnopackage() fi msgpass } + +testdpkginstalled() { + msgtest "Test for correctly installed package(s) with" "dpkg -l $*" + local PKGS="$(dpkg -l $* | grep '^[a-z]' | grep '^[^i]' | wc -l)" + if [ "$PKGS" != 0 ]; then + echo $PKGS + dpkg -l $* | grep '^[a-z]' + msgfail + return 1 + fi + msgpass +} + +testdpkgnoninstalled() { + msgtest "Test for correctly non-installed package(s) with" "dpkg -l $*" + local PKGS="$(dpkg -l $* | grep '^[a-z]' | grep '^[^u]' | wc -l)" + if [ "$PKGS" != 0 ]; then + echo + dpkg -l $* | grep '^[a-z]' + msgfail + return 1 + fi + msgpass +}