[gentoo-commits] proj/binhost:master commit in: builders/demeter/, builders/jiji/

[Andreas K. Hüttel]

commit:     6d6cb508fecf2d4ea96310665a6a008475f43419
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Feb  4 23:04:09 2024 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Feb  4 23:04:09 2024 +0000
URL:        https://gitweb.gentoo.org/proj/binhost.git/commit/?id=6d6cb508

Reset changes in config files

Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 builders/demeter/binhost-update | 1 +
 builders/jiji/binhost-update    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/builders/demeter/binhost-update b/builders/demeter/binhost-update
index 1e235c7..9d1166b 100755
--- a/builders/demeter/binhost-update
+++ b/builders/demeter/binhost-update
@@ -99,6 +99,7 @@ for n in ${NSPAWN_NAMES} ; do
        echo Machine ${n} &>> ${TMPFILE}
        echo &>> ${TMPFILE}
        cd /var/lib/machines/${n}/etc/binhost &>> ${TMPFILE}
+       git reset --hard &>> ${TMPFILE}
        git pull -q &>> ${TMPFILE}
        cd /root &>> ${TMPFILE}
        systemd-nspawn --bind /var/cache/distfiles --bind-ro 
/var/db/repos/gentoo --tmpfs=/var/tmp:mode=1777,size=${TMPFS_SIZE}g -M ${n} 
/root/bin/run-update &>> ${TMPFILE}

diff --git a/builders/jiji/binhost-update b/builders/jiji/binhost-update
index 17953d0..3c7e6bb 100755
--- a/builders/jiji/binhost-update
+++ b/builders/jiji/binhost-update
@@ -99,6 +99,7 @@ for n in ${NSPAWN_NAMES} ; do
        echo Machine ${n} &>> ${TMPFILE}
        echo &>> ${TMPFILE}
        cd /var/lib/machines/${n}/etc/binhost &>> ${TMPFILE}
+       git reset --hard &>> ${TMPFILE}
        git pull -q &>> ${TMPFILE}
        cd /root &>> ${TMPFILE}
        systemd-nspawn --bind /var/cache/distfiles --bind-ro 
/var/db/repos/gentoo --tmpfs=/var/tmp:mode=1777,size=${TMPFS_SIZE}g -M ${n} 
/root/bin/run-update &>> ${TMPFILE}