Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes #3212 : Add commit when directives change on technique upgreade #106

Merged
merged 1 commit into from Jan 30, 2013
Merged

Fixes #3212 : Add commit when directives change on technique upgreade #106

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions rudder-core/src/main/scala/com/normation/rudder/repository/xml/GitArchiverImpl.scala
View file
Open in desktop
Expand Up @@ -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 {
Expand Down Expand Up @@ -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")
Expand Down Expand Up @@ -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(
Expand Down