Skip to content

Commit

Permalink
Merge pull request #610 from intersystems/fix-607
Browse files Browse the repository at this point in the history
fix: report deletion of things that aren't classes
  • Loading branch information
isc-tleavitt authored Oct 30, 2024
2 parents 30c2266 + 884bc57 commit 80c6f07
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- #544: When installing a package from remote repo, IPM specifies `includePrerelease` and `includeSnapshots` in HTTP request. Correctly-behaving zpm registry should respect that.
- #557: When comparing semver against semver expressions, exclude prereleases and snapshots from the range maximum.
- #559: Allow treating the "w" in SemVer x.y.z-w as a post-release rather than pre-release.
- #607: Uninstall reports deletion of non-classes

### Security
-
Expand Down
9 changes: 6 additions & 3 deletions src/cls/IPM/Lifecycle/Base.cls
Original file line number Diff line number Diff line change
Expand Up @@ -281,9 +281,9 @@ Method %Clean(ByRef pParams) As %Status
}

Set tName = $Piece(tChildKey,".",1,*-1)
Set tExt = $Piece(tChildKey,".",*)
Continue:tExt=""
Continue:tName=""
Set tExt = $ZConvert($Piece(tChildKey,".",*),"U")
Continue:tExt=""
Continue:tName=""
Set tDeleteArray(tExt,tName) = ""
}
}
Expand Down Expand Up @@ -344,6 +344,9 @@ Method %Clean(ByRef pParams) As %Status
Continue
}

If tVerbose {
Write !,"Deleting ",tFullName
}
Set tDelSC = ##class(%Library.RoutineMgr).Delete(tFullName)
If $$$ISERR(tDelSC) {
Write !,"WARNING: "_$System.Status.GetErrorText(tDelSC)
Expand Down

0 comments on commit 80c6f07

Please sign in to comment.