Merge pull request #52 from svanharmelen/dev

Making Chef-Guard compatible with Berkshelf
xanzy · Oct 14, 2014 · 5194486 · 5194486
2 parents 1d783ba + e614c32
commit 5194486
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,10 @@
 Chef-Guard CHANGELOG
 ====================
 
+0.4.4
+-----
+- When you try to overwrite a frozen cookbook return a HTTP 409 error instead of a HTTP 412 so Berkshelf doesn't crash on it but just reports it.
+
 0.4.3
 -----
 - Fixed logic error in the getChangeDetails func, where the extention '.json' was sometimes left out and sometimes added twice

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.4.3
+0.4.4
diff --git a/validations.go b/validations.go
@@ -72,7 +72,7 @@ func (cg *ChefGuard) checkCookbookFrozen() (int, error) {
 	if frozen, err := cg.cookbookFrozen(cg.Cookbook.Name, cg.Cookbook.Version); err != nil {
 		return http.StatusBadGateway, err
 	} else if frozen {
-		return http.StatusPreconditionFailed, fmt.Errorf("\n=== Cookbook Upload error found ===\n" +
+		return http.StatusConflict, fmt.Errorf("\n=== Cookbook Upload error found ===\n" +
 			"The cookbook you are trying to upload is frozen!\n" +
 			"It is not allowed to overwrite a frozen cookbook,\n" +
 			"so please bump the version and try again.\n" +