Skip to content

Normalize Home directory everywhere #3096

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
forki merged 5 commits into from
Feb 28, 2018
Merged

Normalize Home directory everywhere #3096

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8ef8cfd
Resolve home folder in paket.dependencies (cache) correctly
oopbase Feb 27, 2018
668b87d
Rename "fileName" to "line"
oopbase Feb 27, 2018
fb52513
normalizeHomeDirectory everywhere
forki Feb 28, 2018
d09d662
fix test
forki Feb 28, 2018
b5542bb
fix test
forki Feb 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Rename "fileName" to "line"
  • Loading branch information
@oopbase @forki
oopbase authored and forki committed Feb 28, 2018
commit 668b87d6236122650e9b7fb9ddea9994b1587d0f
6 changes: 3 additions & 3 deletions src/Paket.Core/Versioning/Cache.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ type Cache = {
{ this with Location = Path.Combine(root,this.Location) |> normalizePath }

static member Parse(line : string) =
let normalizeHomeDirectory (fileName : string) =
let normalizeHomeDirectory (line : string) =
let homeDirectory = "~"
fileName.Replace(homeDirectory, Environment.GetFolderPath(Environment.SpecialFolder.UserProfile))
line.Replace(homeDirectory, Environment.GetFolderPath(Environment.SpecialFolder.UserProfile))

let normalizedLine = normalizeHomeDirectory line

Expand Down Expand Up @@ -66,4 +66,4 @@ module Cache =
lock lockObj (fun () -> inaccessibleCaches.Add cache |> ignore)

let isInaccessible cache =
lock lockObj (fun () -> inaccessibleCaches.Contains cache)
lock lockObj (fun () -> inaccessibleCaches.Contains cache)