Skip to content

Commit 7191fc0

Browse files
committed
Mark registry excluded from block_until_ready
1 parent ce9a6ab commit 7191fc0

File tree

1 file changed

+12
-12
lines changed
  • src/cargo/sources/registry

1 file changed

+12
-12
lines changed

src/cargo/sources/registry/mod.rs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -554,18 +554,6 @@ impl<'cfg> RegistrySource<'cfg> {
554554
Box::new(remote::RemoteRegistry::new(source_id, config, &name)) as Box<_>
555555
};
556556

557-
// Before starting to work on the registry, make sure that
558-
// `<cargo_home>/registry` is marked as excluded from indexing and
559-
// backups. Older versions of Cargo didn't do this, so we do it here
560-
// regardless of whether `<cargo_home>` exists.
561-
//
562-
// This does not use `create_dir_all_excluded_from_backups_atomic` for
563-
// the same reason: we want to exclude it even if the directory already
564-
// exists.
565-
let registry_base = config.registry_base_path();
566-
registry_base.create_dir()?;
567-
exclude_from_backups_and_indexing(&registry_base.into_path_unlocked())?;
568-
569557
Ok(RegistrySource::new(
570558
source_id,
571559
config,
@@ -826,6 +814,18 @@ impl<'cfg> Source for RegistrySource<'cfg> {
826814
}
827815

828816
fn block_until_ready(&mut self) -> CargoResult<()> {
817+
// Before starting to work on the registry, make sure that
818+
// `<cargo_home>/registry` is marked as excluded from indexing and
819+
// backups. Older versions of Cargo didn't do this, so we do it here
820+
// regardless of whether `<cargo_home>` exists.
821+
//
822+
// This does not use `create_dir_all_excluded_from_backups_atomic` for
823+
// the same reason: we want to exclude it even if the directory already
824+
// exists.
825+
let registry_base = self.config.registry_base_path();
826+
registry_base.create_dir()?;
827+
exclude_from_backups_and_indexing(&registry_base.into_path_unlocked())?;
828+
829829
self.ops.block_until_ready()
830830
}
831831
}

0 commit comments

Comments
 (0)