fix: dfx start --clean on already clean state#915

Merged

mergify[bot] merged 1 commit intomasterfrom

Aug 11, 2020

Contributor

chenyan-dfinity commented Aug 11, 2020 •

edited

Loading

dfx start --clean crashes on already clean project. We don't need to remove the directory if it doesn't exist.


          fix: dfx start --clean on already clean state

11b61fc

chenyan-dfinity requested a review from a team

August 11, 2020 01:28

chenyan-dfinity added the automerge-squash label

hansl approved these changes

View reviewed changes

Contributor

hansl left a comment

Non blocking but I think we should error if it's a file.

src/dfx/src/commands/start.rs

                       // hope we do not need to.
-                      fs::remove_dir_all(state_root.clone()).map_err(DfxError::CleanState)?;
-                      fs::remove_dir_all(temp_dir.join("local")).map_err(DfxError::CleanState)?;
+                      if state_root.is_dir() {

Contributor

hansl Aug 11, 2020

Just exists()? If it's a file you're doing something wrong.

Contributor Author

chenyan-dfinity Aug 11, 2020

I think both are fine. If it's a file, you have a lot of opportunities to get the error later in the process, which may give more meaningful error message?

mergify bot merged commit ff6bdea into master

mergify bot deleted the fix-start branch

August 11, 2020 01:58

mergify bot removed the automerge-squash label

dfinity-bot added a commit that referenced this pull request


          build: niv advisory-db: update bd8a0f67 -> 86ed5681

4e23c22

## Changelog for advisory-db:
Branch: master
Commits: [rustsec/advisory-db@bd8a0f67...86ed5681](rustsec/advisory-db@bd8a0f6...86ed568)

* [`a7ffa73f`](rustsec/advisory-db@a7ffa73) Add security advisory for evm crate related to memory over-allocation ([RustSec/advisory-db⁠#909](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/909))
* [`26467a96`](rustsec/advisory-db@26467a9) Assigned RUSTSEC-2021-0066 to evm ([RustSec/advisory-db⁠#910](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/910))
* [`7e4cbf61`](rustsec/advisory-db@7e4cbf6) evm-core: fix crate name ([RustSec/advisory-db⁠#911](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/911))
* [`60b9a9e9`](rustsec/advisory-db@60b9a9e) Bump rustsec-admin to v0.4.3 ([RustSec/advisory-db⁠#919](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/919))
* [`c8a2c774`](rustsec/advisory-db@c8a2c77) Add RUSTSEC notice for CVE-2021-32629, a Cranelift miscompilation bug. ([RustSec/advisory-db⁠#918](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/918))
* [`1c038433`](rustsec/advisory-db@1c03843) fixes [RustSec/advisory-db⁠#915](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/915) - remove duplicate word ([RustSec/advisory-db⁠#916](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/916))
* [`256e923a`](rustsec/advisory-db@256e923) Assigned RUSTSEC-2021-0067 to cranelift-codegen ([RustSec/advisory-db⁠#921](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/921))
* [`23334c68`](rustsec/advisory-db@23334c6) Add advisory for iced-x86 soundness bug ([RustSec/advisory-db⁠#914](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/914))
* [`36bf272a`](rustsec/advisory-db@36bf272) iced-x86: fix lint ([RustSec/advisory-db⁠#922](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/922))
* [`a845d0a9`](rustsec/advisory-db@a845d0a) Assigned RUSTSEC-2021-0068 to iced-x86 ([RustSec/advisory-db⁠#923](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/923))
* [`86e2c664`](rustsec/advisory-db@86e2c66) Add lettre smtp vulnerability ([RustSec/advisory-db⁠#924](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/924))
* [`aa04921a`](rustsec/advisory-db@aa04921) Assigned RUSTSEC-2021-0069 to lettre ([RustSec/advisory-db⁠#925](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/925))
* [`3e51834f`](rustsec/advisory-db@3e51834) Make ranges in trust-dns-proto advisory non-overlapping ([RustSec/advisory-db⁠#929](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/929))
* [`40afced5`](rustsec/advisory-db@40afced) Remove range overlaps, fix some range specifications ([RustSec/advisory-db⁠#930](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/930))
* [`46e657b2`](rustsec/advisory-db@46e657b) Add advisory for nalgebra VecStorage/MatrixVec ([RustSec/advisory-db⁠#931](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/931))
* [`9984f61e`](rustsec/advisory-db@9984f61) Assigned RUSTSEC-2021-0070 to nalgebra ([RustSec/advisory-db⁠#932](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/932))
* [`958120be`](rustsec/advisory-db@958120b) Update RUSTSEC-2020-0043.md ([RustSec/advisory-db⁠#934](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/934))
* [`86ed5681`](rustsec/advisory-db@86ed568) Add GHSA mentions to `aliases` field. This is becoming more important with OSV enabling interop between databases ([RustSec/advisory-db⁠#937](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/937))

mergify bot pushed a commit that referenced this pull request


          build: niv advisory-db: update bd8a0f67 -> 86ed5681 (#1707)

2e8fe16

## Changelog for advisory-db:
Branch: master
Commits: [rustsec/advisory-db@bd8a0f67...86ed5681](rustsec/advisory-db@bd8a0f6...86ed568)

* [`a7ffa73f`](rustsec/advisory-db@a7ffa73) Add security advisory for evm crate related to memory over-allocation ([RustSec/advisory-db⁠#909](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/909))
* [`26467a96`](rustsec/advisory-db@26467a9) Assigned RUSTSEC-2021-0066 to evm ([RustSec/advisory-db⁠#910](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/910))
* [`7e4cbf61`](rustsec/advisory-db@7e4cbf6) evm-core: fix crate name ([RustSec/advisory-db⁠#911](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/911))
* [`60b9a9e9`](rustsec/advisory-db@60b9a9e) Bump rustsec-admin to v0.4.3 ([RustSec/advisory-db⁠#919](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/919))
* [`c8a2c774`](rustsec/advisory-db@c8a2c77) Add RUSTSEC notice for CVE-2021-32629, a Cranelift miscompilation bug. ([RustSec/advisory-db⁠#918](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/918))
* [`1c038433`](rustsec/advisory-db@1c03843) fixes [RustSec/advisory-db⁠#915](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/915) - remove duplicate word ([RustSec/advisory-db⁠#916](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/916))
* [`256e923a`](rustsec/advisory-db@256e923) Assigned RUSTSEC-2021-0067 to cranelift-codegen ([RustSec/advisory-db⁠#921](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/921))
* [`23334c68`](rustsec/advisory-db@23334c6) Add advisory for iced-x86 soundness bug ([RustSec/advisory-db⁠#914](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/914))
* [`36bf272a`](rustsec/advisory-db@36bf272) iced-x86: fix lint ([RustSec/advisory-db⁠#922](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/922))
* [`a845d0a9`](rustsec/advisory-db@a845d0a) Assigned RUSTSEC-2021-0068 to iced-x86 ([RustSec/advisory-db⁠#923](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/923))
* [`86e2c664`](rustsec/advisory-db@86e2c66) Add lettre smtp vulnerability ([RustSec/advisory-db⁠#924](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/924))
* [`aa04921a`](rustsec/advisory-db@aa04921) Assigned RUSTSEC-2021-0069 to lettre ([RustSec/advisory-db⁠#925](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/925))
* [`3e51834f`](rustsec/advisory-db@3e51834) Make ranges in trust-dns-proto advisory non-overlapping ([RustSec/advisory-db⁠#929](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/929))
* [`40afced5`](rustsec/advisory-db@40afced) Remove range overlaps, fix some range specifications ([RustSec/advisory-db⁠#930](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/930))
* [`46e657b2`](rustsec/advisory-db@46e657b) Add advisory for nalgebra VecStorage/MatrixVec ([RustSec/advisory-db⁠#931](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/931))
* [`9984f61e`](rustsec/advisory-db@9984f61) Assigned RUSTSEC-2021-0070 to nalgebra ([RustSec/advisory-db⁠#932](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/932))
* [`958120be`](rustsec/advisory-db@958120b) Update RUSTSEC-2020-0043.md ([RustSec/advisory-db⁠#934](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/934))
* [`86ed5681`](rustsec/advisory-db@86ed568) Add GHSA mentions to `aliases` field. This is becoming more important with OSV enabling interop between databases ([RustSec/advisory-db⁠#937](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/937))

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet