From e23f6608e7524c8971f017ad398f3fd1cf38f581 Mon Sep 17 00:00:00 2001
From: Matthew Fisher <matt.fisher@microsoft.com>
Date: Fri, 15 Sep 2017 08:48:49 -0700
Subject: [PATCH] Revert "Write repo file using atomicfile"

This reverts commit 965cb7fd1c1097e1dc597b02530c1f38c06dbfe3.

(cherry picked from commit 9d1db2851e587f42d4010a1380dd23b5eb1bb5a5)
---
 glide.lock            |  2 --
 glide.yaml            |  1 -
 pkg/repo/repo.go      | 14 +-------------
 pkg/repo/repo_test.go | 10 +---------
 4 files changed, 2 insertions(+), 25 deletions(-)

diff --git a/glide.lock b/glide.lock
index 8651e1885..58ef5995c 100644
--- a/glide.lock
+++ b/glide.lock
@@ -68,8 +68,6 @@ imports:
   version: ba18e35c5c1b36ef6334cad706eb681153d2d379
 - name: github.com/exponent-io/jsonpath
   version: d6023ce2651d8eafb5c75bb0c7167536102ec9f5
-- name: github.com/facebookgo/atomicfile
-  version: 2de1f203e7d5e386a6833233882782932729f27e
 - name: github.com/facebookgo/symwalk
   version: 42004b9f322246749dd73ad71008b1f3160c0052
 - name: github.com/fatih/camelcase
diff --git a/glide.yaml b/glide.yaml
index 922c4ff05..07cc38ea1 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -38,7 +38,6 @@ import:
 - package: github.com/gobwas/glob
   version: ^0.2.1
 - package: github.com/evanphx/json-patch
-- package: github.com/facebookgo/atomicfile
 - package: github.com/facebookgo/symwalk
 - package: github.com/BurntSushi/toml
   version: ~0.3.0
diff --git a/pkg/repo/repo.go b/pkg/repo/repo.go
index 5e1b5c6cd..cbf54c572 100644
--- a/pkg/repo/repo.go
+++ b/pkg/repo/repo.go
@@ -23,7 +23,6 @@ import (
 	"os"
 	"time"
 
-	"github.com/facebookgo/atomicfile"
 	"github.com/ghodss/yaml"
 )
 
@@ -135,20 +134,9 @@ func (r *RepoFile) Remove(name string) bool {
 
 // WriteFile writes a repositories file to the given path.
 func (r *RepoFile) WriteFile(path string, perm os.FileMode) error {
-	f, err := atomicfile.New(path, perm)
-	if err != nil {
-		return err
-	}
-
 	data, err := yaml.Marshal(r)
 	if err != nil {
 		return err
 	}
-
-	_, err = f.File.Write(data)
-	if err != nil {
-		return err
-	}
-
-	return f.Close()
+	return ioutil.WriteFile(path, data, perm)
 }
diff --git a/pkg/repo/repo_test.go b/pkg/repo/repo_test.go
index d4500c9e2..6aee41faf 100644
--- a/pkg/repo/repo_test.go
+++ b/pkg/repo/repo_test.go
@@ -201,18 +201,10 @@ func TestWriteFile(t *testing.T) {
 		t.Errorf("failed to create test-file (%v)", err)
 	}
 	defer os.Remove(repoFile.Name())
-
-	fileMode := os.FileMode(0744)
-	if err := sampleRepository.WriteFile(repoFile.Name(), fileMode); err != nil {
+	if err := sampleRepository.WriteFile(repoFile.Name(), 744); err != nil {
 		t.Errorf("failed to write file (%v)", err)
 	}
 
-	info, _ := os.Stat(repoFile.Name())
-	mode := info.Mode()
-	if mode != fileMode {
-		t.Errorf("incorrect file mode: %s (expected %s)", mode, fileMode)
-	}
-
 	repos, err := LoadRepositoriesFile(repoFile.Name())
 	if err != nil {
 		t.Errorf("failed to load file (%v)", err)