From 1d2d673c3fa89ea250454eb5989b7356b7f49064 Mon Sep 17 00:00:00 2001
From: Keagan McClelland <keagan.mcclelland@gmail.com>
Date: Mon, 24 Jan 2022 17:36:04 -0700
Subject: [PATCH] fixes lock ordering issue in recovery

---
 backend/src/setup.rs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/backend/src/setup.rs b/backend/src/setup.rs
index 012bfba1f..d70fad64e 100644
--- a/backend/src/setup.rs
+++ b/backend/src/setup.rs
@@ -10,6 +10,7 @@ use futures::future::BoxFuture;
 use futures::{FutureExt, TryFutureExt, TryStreamExt};
 use nix::unistd::{Gid, Uid};
 use openssl::x509::X509;
+use patch_db::LockType;
 use rpc_toolkit::command;
 use rpc_toolkit::yajrc::RpcError;
 use serde::{Deserialize, Serialize};
@@ -578,6 +579,10 @@ async fn recover_v2(
     let fut = async move {
         let db = ctx.db(&secret_store).await?;
         let mut handle = db.handle();
+        // lock everything to avoid issues with renamed packages (bitwarden)
+        crate::db::DatabaseModel::new()
+            .lock(&mut handle, LockType::Write)
+            .await?;
 
         let apps_yaml_path = recovery_source
             .as_ref()