From 7873fd175d9e4e5bdb281e005b18c388bcfe1dd8 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Wed, 27 May 2020 13:11:45 -0500
Subject: [PATCH] =?UTF-8?q?Don=E2=80=99t=20use=20FileIngestionMethod=20for?=
 =?UTF-8?q?=20StorePathsCommand?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is a different recursive than used in makeFixedOutputPath.
---
 src/nix/command.cc | 10 +++++-----
 src/nix/command.hh |  4 ++--
 src/nix/copy.cc    |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/nix/command.cc b/src/nix/command.cc
index ea0ade88e..71b027719 100644
--- a/src/nix/command.cc
+++ b/src/nix/command.cc
@@ -31,21 +31,21 @@ void StoreCommand::run()
     run(getStore());
 }
 
-StorePathsCommand::StorePathsCommand(FileIngestionMethod recursive)
+StorePathsCommand::StorePathsCommand(bool recursive)
     : recursive(recursive)
 {
-    if (recursive == FileIngestionMethod::Recursive)
+    if (recursive)
         addFlag({
             .longName = "no-recursive",
             .description = "apply operation to specified paths only",
-            .handler = {&this->recursive, FileIngestionMethod::Flat},
+            .handler = {&this->recursive, false},
         });
     else
         addFlag({
             .longName = "recursive",
             .shortName = 'r',
             .description = "apply operation to closure of the specified paths",
-            .handler = {&this->recursive, FileIngestionMethod::Recursive},
+            .handler = {&this->recursive, true},
         });
 
     mkFlag(0, "all", "apply operation to the entire store", &all);
@@ -66,7 +66,7 @@ void StorePathsCommand::run(ref<Store> store)
         for (auto & p : toStorePaths(store, realiseMode, installables))
             storePaths.push_back(p.clone());
 
-        if (recursive == FileIngestionMethod::Recursive) {
+        if (recursive) {
             StorePathSet closure;
             store->computeFSClosure(storePathsToSet(storePaths), closure, false, false);
             storePaths.clear();
diff --git a/src/nix/command.hh b/src/nix/command.hh
index 09c621b5b..959d5f19d 100644
--- a/src/nix/command.hh
+++ b/src/nix/command.hh
@@ -92,7 +92,7 @@ struct StorePathsCommand : public InstallablesCommand
 {
 private:
 
-    FileIngestionMethod recursive = FileIngestionMethod::Flat;
+    bool recursive = false;
     bool all = false;
 
 protected:
@@ -101,7 +101,7 @@ protected:
 
 public:
 
-    StorePathsCommand(FileIngestionMethod recursive = FileIngestionMethod::Flat);
+    StorePathsCommand(bool recursive = false);
 
     using StoreCommand::run;
 
diff --git a/src/nix/copy.cc b/src/nix/copy.cc
index 60aa3f14b..c7c38709d 100644
--- a/src/nix/copy.cc
+++ b/src/nix/copy.cc
@@ -17,7 +17,7 @@ struct CmdCopy : StorePathsCommand
     SubstituteFlag substitute = NoSubstitute;
 
     CmdCopy()
-        : StorePathsCommand(FileIngestionMethod::Recursive)
+        : StorePathsCommand(true)
     {
         addFlag({
             .longName = "from",