Fixes #309: Handle 404 upon repository drop

xerial · Nov 4, 2022 · a2f6a1d · a2f6a1d
1 parent c879f1c
commit a2f6a1d
Showing 1 changed file with 13 additions and 7 deletions.
diff --git a/src/main/scala/xerial/sbt/sonatype/SonatypeClient.scala b/src/main/scala/xerial/sbt/sonatype/SonatypeClient.scala
@@ -220,14 +220,20 @@ class SonatypeClient(
 
   def dropStage(currentProfile: StagingProfile, repo: StagingRepositoryProfile): Response = {
     info(s"Dropping staging repository $repo")
-    val ret = httpClient.call[Map[String, StageTransitionRequest], Response](
-      Http.POST(s"${pathPrefix}/staging/profiles/${repo.profileId}/drop"),
-      newStageTransitionRequest(currentProfile, repo)
-    )
-    if (ret.statusCode != HttpStatus.Created_201.code) {
-      throw SonatypeException(STAGE_FAILURE, s"Failed to drop the repository. [${ret.status}]: ${ret.contentString}")
+    try {
+      val ret = httpClient.call[Map[String, StageTransitionRequest], Response](
+        Http.POST(s"${pathPrefix}/staging/profiles/${repo.profileId}/drop"),
+        newStageTransitionRequest(currentProfile, repo)
+      )
+      if (ret.statusCode != HttpStatus.Created_201.code) {
+        throw SonatypeException(STAGE_FAILURE, s"Failed to drop the repository. [${ret.status}]: ${ret.contentString}")
+      }
+      ret
+    } catch {
+      case e: HttpClientException if e.status == HttpStatus.NotFound_404 =>
+        warn(s"Staging repository ${repo.profileId} is not found. It might have been already dropped: ${e.getMessage}")
+        e.response.toHttpResponse
     }
-    ret
   }
 
   private def newStageTransitionRequest(