From: bors <bors@rust-lang.org>
Date: Mon, 28 May 2018 09:34:35 +0000 (+0000)
Subject: Auto merge of #5570 - alexcrichton:fix-deadlock, r=matklad
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2^2~17
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=228c406e162f67e92b324c6899a7a609a980d464;p=cargo.git

Auto merge of #5570 - alexcrichton:fix-deadlock, r=matklad

Fix an issue of deadlock in Cargo

Currently Cargo can deadlock itself via file locks in somewhat obscure
scenarios. One way to trigger this scenario is by causing the index to fail
being created, for example through an invalid `init.templatedir` configuration.

This commit takes the strategy of solving two bugs:

* First, the deadlock is fixed. This is done by manually ensuring that the
  current deadlock doesn't happen by scheduling cached work to happen outside
  the scope of a lock.
* Second, the initialization of the registry's index is fixed. We turn off the
  usage of external templates as we don't want to use them for this internally
  managed repository anyway.

Closes #5551
---

228c406e162f67e92b324c6899a7a609a980d464