From ca02d71dcf397095dfcc04eeb6a14bbea52232a5 Mon Sep 17 00:00:00 2001 From: Vasily Levchenko Date: Fri, 8 Sep 2017 15:09:07 +0300 Subject: [PATCH] [util][klib] don't remove library which we gonna to install, instead delete one installed in repository --- klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/main.kt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/main.kt b/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/main.kt index c3f465ede2c..4703d258546 100644 --- a/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/main.kt +++ b/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/main.kt @@ -17,10 +17,8 @@ package org.jetbrains.kotlin.cli.klib import kotlin.system.exitProcess -import java.util.Properties // TODO: Extract these as a shared jar? import org.jetbrains.kotlin.backend.konan.library.impl.* -import org.jetbrains.kotlin.backend.konan.library.KonanLibrary import org.jetbrains.kotlin.backend.konan.library.KonanLibrarySearchPathResolver import org.jetbrains.kotlin.konan.file.File import org.jetbrains.kotlin.konan.target.TargetManager @@ -96,7 +94,7 @@ class Library(val name: String, val requestedRepository: String?, val target: St } fun install() { - remove(true) + Library(File(name).name.removeSuffix(".klib"), requestedRepository, target).remove(true) val library = ZippedKonanLibrary(libraryInCurrentDir(name)) val newLocation = File(repository, "klib")