From 5fe233209d9db31cc176edbcc76f9fe801c5eba0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joshua=20Ismael=20Haase=20Hern=C3=A1ndez?= Date: Mon, 6 Feb 2012 09:46:21 -0600 Subject: librechroot: -r option creates empty repo librerelease: exit with error if signing fails --- fullpkg-find | 0 librechroot | 6 +++++- librerelease | 9 +++++++-- 3 files changed, 12 insertions(+), 3 deletions(-) mode change 100644 => 100755 fullpkg-find diff --git a/fullpkg-find b/fullpkg-find old mode 100644 new mode 100755 diff --git a/librechroot b/librechroot index 31516ac..dfeabb0 100755 --- a/librechroot +++ b/librechroot @@ -83,8 +83,12 @@ EOF function clean_repo { msg "Cleaning repo for chroot: ${CHROOTDIR}/${CHROOTNAME}" if [ -d "${CHROOTDIR}/${CHROOTNAME}/repo" ]; then - rm -rf "${CHROOTDIR}/${CHROOTNAME}/repo" + find "${CHROOTDIR}/${CHROOTNAME}/repo/" -mindepth 1 -delete + else + mkdir -p "${CHROOTDIR}/${CHROOTNAME}/repo" fi + bsdtar -czf "${CHROOTDIR}/${CHROOTNAME}/repo/repo.db.tar.gz" -T /dev/null + ln -s "repo.db.tar.gz" "${CHROOTDIR}/${CHROOTNAME}/repo/repo.db" } source /etc/libretools.conf diff --git a/librerelease b/librerelease index f31bc3a..3021393 100755 --- a/librerelease +++ b/librerelease @@ -72,7 +72,12 @@ function sign_packages { fi msg2 "Signing ${package}..." - gpg --default-key "${SIGID}" --output "${package}${SIGEXT}" --detach-sig "${package}" + gpg --default-key "${SIGID}" --output "${package}${SIGEXT}" \ + --detach-sig "${package}" || { + error "Signing failed" + exit 2 + } + done } @@ -110,7 +115,7 @@ done clean_non_packages if [ ! -z "${SIGID}" ]; then sign_packages -else +else error "Package signing is *required*" exit 1 fi -- cgit v1.1-4-g5e80