diff options
| author | Colin Watson <cjwatson@ubuntu.com> | 2016-02-18 14:22:15 (GMT) |
|---|---|---|
| committer | Colin Watson <cjwatson@ubuntu.com> | 2016-02-18 14:22:15 (GMT) |
| commit | e2d63ebc20c8d2ef5d96db83828087505928895f (patch) | |
| tree | af83aa1d517ace6eae3accb89f9601025e23cf4b | |
| parent | e18205251843f916f5593bf52436104b29346139 (diff) | |
Sbuild::ResolverBase: use copy: for dummy archive
We used to use file: URIs for sbuild's dummy archive, but recent
versions of apt put symlinks in /var/lib/apt/lists/ if we do that, which
means that those symlinks become broken as soon as we remove the dummy
archive. sbuild itself is OK with this, but launchpad-buildd tries to
read /var/lib/apt/lists/*_Packages in order to do dep-wait analysis
after failures, and that fails if there are broken symlinks there. It's
easy enough to avoid this problem by using copy: URIs instead, so let's
do that.
| -rw-r--r-- | lib/Sbuild/ResolverBase.pm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/Sbuild/ResolverBase.pm b/lib/Sbuild/ResolverBase.pm index c7b4ab7..810247c 100644 --- a/lib/Sbuild/ResolverBase.pm +++ b/lib/Sbuild/ResolverBase.pm @@ -1113,8 +1113,8 @@ EOF # Older apt from squeeze will still require keys to be generated as it # ignores the trusted=yes. Older apt ignoring this is also why we can add # this unconditionally. - print $tmpfh 'deb [trusted=yes] file://' . $session->strip_chroot_path($dummy_archive_dir) . " ./\n"; - print $tmpfh 'deb-src [trusted=yes] file://' . $session->strip_chroot_path($dummy_archive_dir) . " ./\n"; + print $tmpfh 'deb [trusted=yes] copy://' . $session->strip_chroot_path($dummy_archive_dir) . " ./\n"; + print $tmpfh 'deb-src [trusted=yes] copy://' . $session->strip_chroot_path($dummy_archive_dir) . " ./\n"; for my $repospec (@{$self->get_conf('EXTRA_REPOSITORIES')}) { print $tmpfh "$repospec\n"; |
