Remove unnecessary conditional

NixOS · Sep 16, 2020 · bef138c · bef138c
1 parent 36d973f
commit bef138c
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/src/libstore/daemon.cc b/src/libstore/daemon.cc
@@ -408,16 +408,15 @@ static void performOp(TunnelLogger * logger, ref<Store> store,
         }
 
         logger->startWork();
-        std::optional<StorePath> path;
-        {
+        // Destructor of FramedSource must run before stopWork.
+        StorePath path = [&](){
             FramedSource narSource(from);
-            path = store->addToStoreFromDump(narSource, baseName, method, hashAlgo);
-        }
+            return store->addToStoreFromDump(narSource, baseName, method, hashAlgo);
+        }();
         logger->stopWork();
 
-        if (path /* always */) {
-            to << store->printStorePath(*path);
-        }
+        to << store->printStorePath(path);
+
         break;
     }