[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[Git][ftp-team/dak][master] Fix mirror-excluded-files breaking if file is missing

Title: GitLab

Joerg Jaspert pushed to branch master at Debian FTP Team / dak

Commits:

  • 2e2f18c5
    by Joerg Jaspert at 2023-12-11T22:32:15+01:00 
    Fix mirror-excluded-files breaking if file is missing

Also use correct path depending on actual archiveroot

1 changed file:

Changes:

  • config/debian/dinstall.functions
    ... ... @@ -399,6 +399,10 @@ function mirror() {
    399 399 
             archiveroot="$(get_archiveroot "${archive}")"
    400 400 
             targetpath="${mirrordir}/${archive}"
    401 401
    402 
    +        if [[ ! -f ${archiveroot}/../mirror-excluded-files.list ]]; then
    403 
    +            log "Mirror exclude file should exist, even if it is empty"
    404 
    +            touch ${archiveroot}/../mirror-excluded-files.list
    405 
    +        fi
    402 406 
             log "Regenerating \"public\" mirror/${archive} hardlink fun"
    403 407 
             rsync -aH --link-dest ${archiveroot} \
    404 408 
                 --delete --delete-after --delete-excluded \
    ... ... @@ -407,7 +411,7 @@ function mirror() {
    407 411 
                 --filter 'protect /project/' \
    408 412 
                 --filter 'protect /project/trace/' \
    409 413 
                 --filter 'protect /project/trace/*' \
    410 
    -            --exclude-from=/srv/ftp-master.debian.org/mirror-excluded-files.list \
    414 
    +            --exclude-from=${archiveroot}/../mirror-excluded-files.list \
    411 415 
                 --ignore-errors \
    412 416 
                 ${archiveroot}/. ${targetpath}/.
    413 417

    • —
    View it on GitLab.
    You're receiving this email because of your account on salsa.debian.org. Manage all notifications · Help

    Reply to: