From: Mark Felder <feld@FreeBSD.org>
Date: Sun, 12 Jul 2020 15:59:12 +0000 (-0500)
Subject: Still allow passing the arg, but fallback to MIX_ENV
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;ds=sidebyside;h=46b123cded5f572851652cecedcce22aa87b97e7;p=akkoma

Still allow passing the arg, but fallback to MIX_ENV
---

diff --git a/lib/mix/tasks/pleroma/config.ex b/lib/mix/tasks/pleroma/config.ex
index 343438add..38c6a6f1d 100644
--- a/lib/mix/tasks/pleroma/config.ex
+++ b/lib/mix/tasks/pleroma/config.ex
@@ -83,7 +83,7 @@ defmodule Mix.Tasks.Pleroma.Config do
 
   defp migrate_from_db(opts) do
     if Pleroma.Config.get([:configurable_from_database]) do
-      env = Mix.env()
+      env = opts[:env] || Mix.env()
 
       config_path =
         if Pleroma.Config.get(:release) do