~ubuntu-archive/ubuntu-archive-scripts/trunk

Committer: Steve Langasek
Date: 2023-12-19 06:16:57 UTC
Revision ID: steve.langasek@canonical.com-20231219061657-3vtta1sc7bxqirn5

Handle the rdepends/ALL subtree with rsync instead of diff.

This is a symlink tree and thus immune to patching. germinate-output has
been out of date for some time as a result of non-zero exit codes from diff,
this should fix that.

files modified:
archive-reports

auto-accept

generate-team-p-m

run-pm-notest

run-proposed-migration

update-germinate

update-one-germinate

update-seeds

Show diffs side-by-side

added added

removed removed

update-one-germinate

SEED_SOURCE="file://$HOME/public_html/seeds/"

NEWDIR="$HOME/germinate-output.new/$NAME"

FINALDIR="$HOME/public_html/germinate-output/$NAME"

rm -rf "$NEWDIR"

mkdir -p "$NEWDIR"

cd "$NEWDIR"

python3 "$HOME/germinate/bin/germinate" $GERMINATE_OPTIONS ${SEED_SOURCE:+-S "$SEED_SOURCE"} -m file:///home/ubuntu-archive/mirror/ubuntu -s "$NAME" -d "$DIST,$DIST-updates" ${COMPONENTS:+-c "$COMPONENTS"} > _germinate_output

rm -rf "$HOME/public_html/germinate-output/$NAME.new"

mkdir -p "$HOME/public_html/germinate-output/$NAME.new"

cd "$HOME/public_html/germinate-output/$NAME.new"

python3 "$HOME/germinate/bin/germinate" $GERMINATE_OPTIONS ${SEED_SOURCE:+-S "$SEED_SOURCE"} -m file:///home/ubuntu-archive/mirror/ubuntu -s "$NAME" -d "$DIST" ${COMPONENTS:+-c "$COMPONENTS"} > _germinate_output

cd ..

if [ -e "$FINALDIR" ]; then

rm -rf "$NAME.old"

if [ -e "$NAME" ]; then

# rdepends/ALL is a special case as it's a tree of symlinks and thus

# immune to patching; sync it first before trying to diff.

rsync -avz --delete "$NEWDIR/rdepends/ALL/" "$FINALDIR/rdepends/ALL"

diff -uNr "$FINALDIR" "$NEWDIR" | filterdiff -x '**/rdepends/ALL/**' \

| (cd "$FINALDIR" && patch -p5 -r - --no-backup-if-mismatch)

rm -rf "$NEWDIR"

rsync -avz --delete "$NAME.new/rdepends/ALL/" "$NAME/rdepends/ALL"

diff -uNr "$NAME" "$NAME.new" \

| (cd "$NAME" && patch -p1 -r - --no-backup-if-mismatch)

rm -rf "$NAME.new"

else

mv "$NEWDIR" "$FINALDIR"

mv "$NAME.new" "$NAME"

Older »