Gentoo Archives: gentoo-commits

From: Fabian Groffen <grobian@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/prefix:master commit in: scripts/rsync-generation/
Date: Wed, 28 Feb 2018 14:44:26
Message-Id: 1519829009.ca1ef5e43e9810e10dd16bb3f6b94bf6ee6959c4.grobian@gentoo
1 commit: ca1ef5e43e9810e10dd16bb3f6b94bf6ee6959c4
2 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
3 AuthorDate: Wed Feb 28 14:43:29 2018 +0000
4 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
5 CommitDate: Wed Feb 28 14:43:29 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=ca1ef5e4
7
8 scripts/rsync-generation/update-rsync-master: use -d with git-clean
9
10 also remove stray directories that for some reason where left behind, as
11 they cause verification problems
12
13 scripts/rsync-generation/update-rsync-master.sh | 10 +++++-----
14 1 file changed, 5 insertions(+), 5 deletions(-)
15
16 diff --git a/scripts/rsync-generation/update-rsync-master.sh b/scripts/rsync-generation/update-rsync-master.sh
17 index 770e1b00c6..ef30f387d5 100755
18 --- a/scripts/rsync-generation/update-rsync-master.sh
19 +++ b/scripts/rsync-generation/update-rsync-master.sh
20 @@ -80,7 +80,7 @@ GLOBALSTART=${START}
21 echo "($(date +"%F %R")) updating DTDs"
22 pushd "$DTDDIR" || exit 1
23 fromcommit=$(git log --pretty=format:'%H' -n1)
24 -git clean -fq
25 +git clean -dfq
26 git pull -q
27 tocommit=$(git log --pretty=format:'%H' -n1)
28 apply_git_mtimes "${fromcommit}" "${tocommit}"
29 @@ -94,7 +94,7 @@ echo "($(date +"%F %R")) set date to $(< "${RSYNCDIR}"/metadata/dtd/timestamp.ch
30 echo "($(date +"%F %R")) updating GLSAs"
31 pushd "$GLSADIR" || exit 1
32 fromcommit=$(git log --pretty=format:'%H' -n1)
33 -git clean -fq
34 +git clean -dfq
35 git pull -q
36 tocommit=$(git log --pretty=format:'%H' -n1)
37 apply_git_mtimes "${fromcommit}" "${tocommit}"
38 @@ -108,7 +108,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 clean -fq
43 +git clean -dfq
44 git pull -q
45 tocommit=$(git log --pretty=format:'%H' -n1)
46 apply_git_mtimes "${fromcommit}" "${tocommit}"
47 @@ -136,7 +136,7 @@ START=$(date +%s)
48 echo "($(date +"%F %R")) updating the gx86 tree"
49 pushd "${GENTOOX86DIR}" || exit 1
50 fromcommit=$(git log --pretty=format:'%H' -n1)
51 -git clean -fq
52 +git clean -dfq
53 git pull -q
54 tocommit=$(git log --pretty=format:'%H' -n1)
55 apply_git_mtimes "${fromcommit}" "${tocommit}"
56 @@ -162,7 +162,7 @@ START=$(date +%s)
57 echo "($(date +"%F %R")) updating Prefix tree (Git image)"
58 pushd "$PREFIXTREEDIR" || exit 1
59 fromcommit=$(git log --pretty=format:'%H' -n1)
60 -git clean -fq
61 +git clean -dfq
62 git pull -q
63 tocommit=$(git log --pretty=format:'%H' -n1)
64 apply_git_mtimes "${fromcommit}" "${tocommit}"