diff options
| author | Ganesh Viswanathan <dev@genotrance.com> | 2018-09-14 18:34:56 -0500 |
|---|---|---|
| committer | Ganesh Viswanathan <dev@genotrance.com> | 2018-09-14 18:34:56 -0500 |
| commit | 80520eef3cce0b3145dedc71a6652429adb9cc9e (patch) | |
| tree | d64725d2749cb82bfef997bbbdb443cc4827de6d /compiler/packagehandling.nim | |
| parent | e07a256f74b9e89e49287c8a21c1334af43e27c2 (diff) | |
| parent | b9dc486db15bb1b4b6f3cef7626733b904d377f7 (diff) | |
| download | Nim-80520eef3cce0b3145dedc71a6652429adb9cc9e.tar.gz | |
Merge remote-tracking branch 'upstream/devel' into test-6483
Diffstat (limited to 'compiler/packagehandling.nim')
| -rw-r--r-- | compiler/packagehandling.nim | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler/packagehandling.nim b/compiler/packagehandling.nim index 7414aeb71..f94c3d72c 100644 --- a/compiler/packagehandling.nim +++ b/compiler/packagehandling.nim @@ -41,10 +41,10 @@ proc getPackageName*(conf: ConfigRef; path: string): string = dec parents if parents <= 0: break -proc withPackageName*(conf: ConfigRef; path: string): string = - let x = getPackageName(conf, path) +proc withPackageName*(conf: ConfigRef; path: AbsoluteFile): AbsoluteFile = + let x = getPackageName(conf, path.string) if x.len == 0: result = path else: let (p, file, ext) = path.splitFile - result = (p / (x & '_' & file)) & ext + result = p / RelativeFile((x & '_' & file) & ext) |