Merge pull request #1573 from OCamlPro/pin-import-err

pin import: revert pins if no solution and on user abort
ocaml · Aug 9, 2014 · 1fbeaa7 · 1fbeaa7
2 parents 9c2e170 + 72f4f46
commit 1fbeaa7
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/src/client/opamSwitchCommand.ml b/src/client/opamSwitchCommand.ml
@@ -386,6 +386,9 @@ let import_t importfile t =
       revert_pins ();
       raise e
   in
+  (match solution with
+   | No_solution | Aborted -> revert_pins ()
+   | Error _ | OK _ | Nothing_to_do -> ());
   OpamSolution.check_solution t solution
 
 let export filename =