Merge lp:~cjwatson/ubuntu-archive-publishing/tidy-copy-indices into lp:ubuntu-archive-publishing

[Colin Watson]

Improve copying of overrides.

The old ubuntu-rtm publisher job produces this error every time it runs:

  rsync: link_stat "/srv/launchpad.net/ubuntu-rtm-archive/ubuntu-rtm-overrides/override.*" failed: No such file or directory (2)
  rsync error: some files/attrs were not transferred (see previous errors) (code 23) at main.c(1183) [sender=3.1.1]
  run-parts: /srv/launchpad.net/publisher-parts/ubuntu-rtm/publish-distro.d/30-copy-indices exited with return code 23

While ubuntu-rtm itself is obviously obsolete, it's easy enough to fix the rsync invocation here so that it doesn't have this problem in the edge case where there are no override files to copy.

Unmerged revisions

124. By Colin Watson on 2023-08-03

Improve copying of overrides.

The old ubuntu-rtm publisher job produces this error every time it runs:

  rsync: link_stat "/srv/launchpad.net/ubuntu-rtm-archive/ubuntu-rtm-overrides/override.*" failed: No such file or directory (2)
  rsync error: some files/attrs were not transferred (see previous errors) (code 23) at main.c(1183) [sender=3.1.1]
  run-parts: /srv/launchpad.net/publisher-parts/ubuntu-rtm/publish-distro.d/30-copy-indices exited with return code 23

While ubuntu-rtm itself is obviously obsolete, it's easy enough to fix
the rsync invocation here so that it doesn't have this problem in the
edge case where there are no override files to copy.

=== modified file 'publish-distro.d/30-copy-indices'
--- publish-distro.d/30-copy-indices	2015-03-27 00:00:42 +0000
+++ publish-distro.d/30-copy-indices	2023-08-03 07:17:40 +0000
@@ -7,6 +7,6 @@
     INDICES=$ARCHIVEROOT/indices
 
     mkdir -p -- $INDICES
-    rm -f -- $INDICES/override
-    rsync -a -- $OVERRIDEROOT/override.* $INDICES/
+    rsync -a --include override.\* --exclude \* --delete \
+        $OVERRIDEROOT/ $INDICES/
 fi