diff options
| author | Colin Guthrie <colin@mageia.org> | 2014-02-10 09:01:37 +0000 |
|---|---|---|
| committer | Colin Guthrie <colin@mageia.org> | 2014-02-10 09:01:37 +0000 |
| commit | 5afd6974a9c808f750200a7a257f31f9f0b68350 (patch) | |
| tree | 4fb0480332a45e897a400c5a465b5a79a30749d8 /modules | |
| parent | 91fa1d1d7bb7a6a2441a65e6f9889153b84cad14 (diff) | |
| download | puppet-5afd6974a9c808f750200a7a257f31f9f0b68350.tar puppet-5afd6974a9c808f750200a7a257f31f9f0b68350.tar.gz puppet-5afd6974a9c808f750200a7a257f31f9f0b68350.tar.bz2 puppet-5afd6974a9c808f750200a7a257f31f9f0b68350.tar.xz puppet-5afd6974a9c808f750200a7a257f31f9f0b68350.zip | |
gitmirror: Use two rsyncs rather than have a config file race.
Diffstat (limited to 'modules')
| -rwxr-xr-x | modules/gitmirror/templates/rsync-metadata.sh | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/modules/gitmirror/templates/rsync-metadata.sh b/modules/gitmirror/templates/rsync-metadata.sh index 7176cc54..fe3b8bef 100755 --- a/modules/gitmirror/templates/rsync-metadata.sh +++ b/modules/gitmirror/templates/rsync-metadata.sh @@ -9,10 +9,8 @@ if [ ! -d "$GITROOT/$REPO" ]; then exit 1 fi -cp -af "$GITROOT/$REPO/config" "$GITROOT/$REPO/config.orig" -/usr/bin/rsync -a --delete --include="description" --include="config" --include="info" --include="info/web" --include="info/web/last-modified" --exclude="*" "$RSYNCROOT/$REPO/" "$GITROOT/$REPO/" -cp -af "$GITROOT/$REPO/config" "$GITROOT/$REPO/config.upstream" -mv -f "$GITROOT/$REPO/config.orig" "$GITROOT/$REPO/config" +/usr/bin/rsync -a --include="description" --include="info" --include="info/web" --include="info/web/last-modified" --exclude="*" "$RSYNCROOT/$REPO/" "$GITROOT/$REPO/" +/usr/bin/rsync -a "$RSYNCROOT/$REPO/config" "$GITROOT/$REPO/config.upstream" OWNER=$(git config --file "$GITROOT/$REPO/config.upstream" gitweb.owner) DESC=$(git config --file "$GITROOT/$REPO/config.upstream" gitweb.description) |