| 1 |
commit: 3cd8bfde8bf2f6f408706bab10600ef96443d91b |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Aug 17 19:26:40 2022 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Aug 17 19:26:40 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=3cd8bfde |
| 7 |
|
| 8 |
scripts/rsync-generation/update-rsync-master: zap any changes before pull |
| 9 |
|
| 10 |
Somehow the git trees can get dirty, ensure they are completely clean |
| 11 |
each time. |
| 12 |
|
| 13 |
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> |
| 14 |
|
| 15 |
scripts/rsync-generation/update-rsync-master.sh | 5 +++++ |
| 16 |
1 file changed, 5 insertions(+) |
| 17 |
|
| 18 |
diff --git a/scripts/rsync-generation/update-rsync-master.sh b/scripts/rsync-generation/update-rsync-master.sh |
| 19 |
index d345da831e..d2e72ffec6 100755 |
| 20 |
--- a/scripts/rsync-generation/update-rsync-master.sh |
| 21 |
+++ b/scripts/rsync-generation/update-rsync-master.sh |
| 22 |
@@ -106,6 +106,7 @@ GLOBALSTART=${START} |
| 23 |
echo "($(date +"%F %R")) updating DTDs" |
| 24 |
pushd "$DTDDIR" || exit 1 |
| 25 |
fromcommit=$(git log --pretty=format:'%H' -n1) |
| 26 |
+git checkout -q . |
| 27 |
git clean -dfq |
| 28 |
git pull -q |
| 29 |
tocommit=$(git log --pretty=format:'%H' -n1) |
| 30 |
@@ -120,6 +121,7 @@ echo "($(date +"%F %R")) set date to $(< "${RSYNCDIR}"/metadata/dtd/timestamp.ch |
| 31 |
echo "($(date +"%F %R")) updating GLSAs" |
| 32 |
pushd "$GLSADIR" || exit 1 |
| 33 |
fromcommit=$(git log --pretty=format:'%H' -n1) |
| 34 |
+git checkout -q . |
| 35 |
git clean -dfq |
| 36 |
git pull -q |
| 37 |
tocommit=$(git log --pretty=format:'%H' -n1) |
| 38 |
@@ -134,6 +136,7 @@ echo "($(date +"%F %R")) set date to $(< "${RSYNCDIR}"/metadata/glsa/timestamp.c |
| 39 |
echo "($(date +"%F %R")) updating news" |
| 40 |
pushd "$NEWSDIR" || exit 1 |
| 41 |
fromcommit=$(git log --pretty=format:'%H' -n1) |
| 42 |
+git checkout -q . |
| 43 |
git clean -dfq |
| 44 |
git pull -q |
| 45 |
tocommit=$(git log --pretty=format:'%H' -n1) |
| 46 |
@@ -162,6 +165,7 @@ START=$(date +%s) |
| 47 |
echo "($(date +"%F %R")) updating the gx86 tree" |
| 48 |
pushd "${GENTOOX86DIR}" || exit 1 |
| 49 |
fromcommit=$(git log --pretty=format:'%H' -n1) |
| 50 |
+git checkout -q . |
| 51 |
git clean -dfq |
| 52 |
git pull -q |
| 53 |
tocommit=$(git log --pretty=format:'%H' -n1) |
| 54 |
@@ -189,6 +193,7 @@ START=$(date +%s) |
| 55 |
echo "($(date +"%F %R")) updating Prefix tree (Git image)" |
| 56 |
pushd "$PREFIXTREEDIR" || exit 1 |
| 57 |
fromcommit=$(git log --pretty=format:'%H' -n1) |
| 58 |
+git checkout -q . |
| 59 |
git clean -dfq |
| 60 |
git pull -q |
| 61 |
tocommit=$(git log --pretty=format:'%H' -n1) |
Archives