Merge branch 'master' into debian-master

[deb/packages.git] / bin / create_mirror

diff --git a/bin/create_mirror b/bin/create_mirror
index da17e90618cdd8061c8fd738c9d7c7fb1737a3a5..6ce48604b04919403bad427cd104fef359f0380b 100755 (executable)
--- a/bin/create_mirror
+++ b/bin/create_mirror
@@ -12,7 +12,7 @@ STAMP=$(date "+%Y%m%d%H%M")
 new="$mirror/$STAMP"
 mkdir $new
 
-if lockfile -! -r2 -300 "$mirror/mirror.lock"
+if lockfile -! -l 3600 -r2 -300 "$mirror/mirror.lock"
 then
     echo "couldn't aquire mirror.lock in due time"
     exit 1;
@@ -44,12 +44,13 @@ do
       --exclude '*.new' --exclude '*.sed.in' \
       --exclude '*.slices' --exclude '*~' \
       --exclude '*.lock' --exclude '*.ttc' --exclude 'logs/' \
-      --exclude 'packages/*/' --exclude 'changelogs.*' \
-      --exclude 'changelogs/**/log' \
+      --exclude 'packages/*/' --exclude 'changelogs.*.dump' \
+      --exclude 'changelogs.cache' --exclude 'changelogs/**/log' \
       --exclude "/auto" --exclude "/Search" --exclude "/perl" \
       --delete-excluded --delete-after \
       "$topdir/$d/" "$new/$d/"
 done
+LC_ALL=POSIX LANG=POSIX date -u > "$new/www/Pics/.trace"
 
 ln -sfT $new $mirror/current
 find $mirror -mindepth 1 -maxdepth 1 -not -name "${STAMP}" -type d -print0 \