Skip to content

Commit 6bb25c3

Browse files
committed
fix issue where importing PTD items reexports them as changed
1 parent e507af0 commit 6bb25c3

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

cls/SourceControl/Git/Extension.cls

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -272,6 +272,7 @@ Method OnBeforeTimestamp(InternalName As %String)
272272
Method OnAfterSave(InternalName As %String, Object As %RegisteredObject = {$$$NULLOREF}) As %Status
273273
{
274274
set sc = $$$OK
275+
quit:$get(%gscSkipSaveHooks) sc
275276
try {
276277
set InternalName = ##class(SourceControl.Git.Utils).NormalizeInternalName(.InternalName)
277278
set context = ##class(SourceControl.Git.PackageManagerContext).ForInternalName(InternalName)

cls/SourceControl/Git/Utils.cls

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1265,6 +1265,10 @@ ClassMethod ImportItem(InternalName As %String, force As %Boolean = 0, verbose A
12651265
set type = ..Type(InternalName)
12661266
if ..IsRoutineOutdated(InternalName) || force || (type = "ptd"){
12671267
if (type = "ptd") && ##class(%Library.EnsembleMgr).IsEnsembleNamespace() {
1268+
// Deployment manager should not reexport because studio project file includes timestamp
1269+
// ideally we could just new %SourceControl, but Ens portal config pages do not use %SourceControl
1270+
new %gscSkipSaveHooks
1271+
set %gscSkipSaveHooks = 1
12681272
set targetProduction = $piece(InternalName,"||",1)
12691273
set rollbackFile = ##class(%File).TempFilename()
12701274
set sc = ##class(Ens.Deployment.Deploy).DeployCode(filename,targetProduction,0,rollbackFile)

0 commit comments

Comments
 (0)