From 2dcb4dc06ea2b1a758f30c7d16723929e659f855 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 10 Aug 2015 21:45:00 +0200 Subject: [PATCH] Updating stat calls to also give the right result in container setups, thanks to Kristian Klausen (Closes: #789300). --- functions/cache.sh | 2 +- scripts/build/chroot_archives | 4 ++-- scripts/build/installer_debian-installer | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/functions/cache.sh b/functions/cache.sh index bea0647ca..467a67491 100755 --- a/functions/cache.sh +++ b/functions/cache.sh @@ -17,7 +17,7 @@ Restore_cache () if [ -e "${DIRECTORY}" ] then # Restore old cache - if [ "$(stat --printf %d ${DIRECTORY})" = "$(stat --printf %d chroot/var/cache/apt/archives)" ] + if [ "$(stat --printf %d ${DIRECTORY}/)" = "$(stat --printf %d chroot/var/cache/apt/archives/)" ] then # with hardlinks find "${DIRECTORY}" -name "*.deb" | xargs cp -fl -t chroot/var/cache/apt/archives diff --git a/scripts/build/chroot_archives b/scripts/build/chroot_archives index a52a44d22..029afe7df 100755 --- a/scripts/build/chroot_archives +++ b/scripts/build/chroot_archives @@ -220,8 +220,8 @@ EOF rm -rf chroot/root/packages mkdir -p chroot/root/packages - if [ "$(stat --printf %d config/packages.chroot)" = "$(stat --printf %d chroot/root/packages)" ] || - [ "$(stat --printf %d config/packages)" = "$(stat --printf %d chroot/root/packages)" ] + if [ "$(stat --printf %d config/packages.chroot/)" = "$(stat --printf %d chroot/root/packages/)" ] || + [ "$(stat --printf %d config/packages/)" = "$(stat --printf %d chroot/root/packages/)" ] then CP_OPTIONS="-l" fi diff --git a/scripts/build/installer_debian-installer b/scripts/build/installer_debian-installer index 5445753da..b9f44b5d8 100755 --- a/scripts/build/installer_debian-installer +++ b/scripts/build/installer_debian-installer @@ -224,7 +224,7 @@ Download_file () { fi fi - if [ "$(stat --printf %d "${_LB_CACHE_DIR}")" = "$(stat --printf %d ./)" ] + if [ "$(stat --printf %d "${_LB_CACHE_DIR}/")" = "$(stat --printf %d ./)" ] then CP_OPTIONS="-l" fi -- 2.11.4.GIT