Merge pull request #106 from VinceMacBuche/bug_3212/fixing_missing_co…

…mmit_in_history Fixes #3212 : Add commit when directives change on technique upgreade
Normation · Jan 30, 2013 · b986cda · b986cda
2 parents 833a7eb + ed21520
commit b986cda
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/rudder-core/src/main/scala/com/normation/rudder/repository/xml/GitArchiverImpl.scala b/rudder-core/src/main/scala/com/normation/rudder/repository/xml/GitArchiverImpl.scala
@@ -332,7 +332,7 @@ class UpdatePiOnActiveTechniqueEvent(
         optDirectiveArchived =  (for {
                                   directive  <- directiveRepository.getDirective(directiveId) ?~! "Can not find directive with id '%s' in repository".format(directiveId.value)
                                   technique  <- Box(techniqeRepository.get(TechniqueId(activeTechnique.techniqueName, directive.techniqueVersion))) ?~! "Can not find Technique '%s:%s'".format(activeTechnique.techniqueName.value, directive.techniqueVersion)
-                                  archivedPi <- gitDirectiveArchiver.archiveDirective(directive, technique.id.name, parents, technique.rootSection, None)
+                                  archivedPi <- gitDirectiveArchiver.archiveDirective(directive, technique.id.name, parents, technique.rootSection, gitCommit)
                                 } yield {
                                   archivedPi
                                 }) match {
@@ -390,7 +390,7 @@ class GitActiveTechniqueArchiverImpl(
       //strategy for callbaack:
       //if at least one callback is in error, we don't execute the others and the full ActiveTechnique is in error.
       //if none is in error, we are going to next step             
-      callbacks <- sequence(uptModificationCallback) { _.onArchive(activeTechnique, parents, None) }
+      callbacks <- sequence(uptModificationCallback) { _.onArchive(activeTechnique, parents, gitCommit) }
       commit    <- gitCommit match {
                      case Some((commiter, reason)) => commitAddFile(commiter, gitPath, "Archive of technique library template for technique name '%s'%s".format(activeTechnique.techniqueName.value, GET(reason)))
                      case None => Full("ok")
@@ -445,7 +445,7 @@ class GitActiveTechniqueArchiverImpl(
                            if(oldActiveTechniqueDirectory.exists) FileUtils.forceDelete(oldActiveTechniqueDirectory)
                            else "ok"
                          }
-      archived        <- archiveActiveTechnique(activeTechnique, newParents, None)
+      archived        <- archiveActiveTechnique(activeTechnique, newParents, gitCommit)
       commited        <- gitCommit match {
                            case Some((commiter, reason)) => 
                              commitMvDirectory(