mirror/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00
Code Issues Projects Releases Wiki Activity

vpm: fix the direct installation of github repositories via the --git flag (#16724)

Browse Source
This commit is contained in:
Swastik Baranwal 2022-12-20 21:08:08 +05:30 committed by GitHub
parent 2f9becc98d
commit d19c1ef087
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
cmd/tools/vpm.v
View File

@ -306,31 +306,33 @@ fn vpm_install_from_vcs(module_names []string, vcs_key string) {
return return
} }
minfo := mod_name_info(vmod.name) minfo := mod_name_info(vmod.name)
println('Relocating module from "${name}" to "${vmod.name}" ( "${minfo.final_module_path}" ) ...') if final_module_path != minfo.final_module_path {
if os.exists(minfo.final_module_path) { println('Relocating module from "${name}" to "${vmod.name}" ( "${minfo.final_module_path}" ) ...')
eprintln('Warning module "${minfo.final_module_path}" already exsits!') if os.exists(minfo.final_module_path) {
eprintln('Removing module "${minfo.final_module_path}" ...') eprintln('Warning module "${minfo.final_module_path}" already exsits!')
os.rmdir_all(minfo.final_module_path) or { eprintln('Removing module "${minfo.final_module_path}" ...')
errors++ os.rmdir_all(minfo.final_module_path) or {
println('Errors while removing "${minfo.final_module_path}" :') errors++
println(err) println('Errors while removing "${minfo.final_module_path}" :')
continue println(err)
continue
}
} }
} os.mv(final_module_path, minfo.final_module_path) or {
os.mv(final_module_path, minfo.final_module_path) or {
errors++
eprintln('Errors while relocating module "${name}" :')
eprintln(err)
os.rmdir_all(final_module_path) or {
errors++ errors++
eprintln('Errors while removing "${final_module_path}" :') eprintln('Errors while relocating module "${name}" :')
eprintln(err) eprintln(err)
os.rmdir_all(final_module_path) or {
errors++
eprintln('Errors while removing "${final_module_path}" :')
eprintln(err)
continue
}
continue continue
} }
continue println('Module "${name}" relocated to "${vmod.name}" successfully.')
final_module_path = minfo.final_module_path
} }
println('Module "${name}" relocated to "${vmod.name}" successfully.')
final_module_path = minfo.final_module_path
name = vmod.name name = vmod.name
} }
resolve_dependencies(name, final_module_path, module_names) resolve_dependencies(name, final_module_path, module_names)