diff options
| author | Joe Richey joerichey@google.com <joerichey@google.com> | 2017-06-28 13:57:55 -0700 |
|---|---|---|
| committer | Joe Richey joerichey@google.com <joerichey@google.com> | 2017-06-28 15:15:21 -0700 |
| commit | 2c52eca8727df744d093703bbcbd87fc39d57d30 (patch) | |
| tree | ce733819f34baacbb67d5dabb5baaa01c6888e9d /metadata | |
| parent | abdd12ff9efa98af245b91517398ad84b42fd90e (diff) | |
This commit changes all the internal import paths from `fscrypt/foo` to
`github.com/google/fscrypt/foo` so that it can be built once we release
externaly. The documentation in README.md is updated accordingly.
Also, the README has a note noting that we do not make any guarantees
about project stability before 1.0 (when it ships with Ubuntu).
Change-Id: I6ba86e442c74057c8a06ba32a42e17f94833e280
Diffstat (limited to 'metadata')
| -rw-r--r-- | metadata/checks.go | 2 | ||||
| -rw-r--r-- | metadata/policy.go | 2 | ||||
| -rw-r--r-- | metadata/policy_test.go | 7 |
3 files changed, 6 insertions, 5 deletions
diff --git a/metadata/checks.go b/metadata/checks.go index 074d79e..4fe4531 100644 --- a/metadata/checks.go +++ b/metadata/checks.go @@ -23,7 +23,7 @@ import ( "github.com/golang/protobuf/proto" "github.com/pkg/errors" - "fscrypt/util" + "github.com/google/fscrypt/util" ) var errNotInitialized = errors.New("not initialized") diff --git a/metadata/policy.go b/metadata/policy.go index 259fe04..533d48a 100644 --- a/metadata/policy.go +++ b/metadata/policy.go @@ -30,7 +30,7 @@ import ( "github.com/pkg/errors" "golang.org/x/sys/unix" - "fscrypt/util" + "github.com/google/fscrypt/util" ) // Encryption specific errors diff --git a/metadata/policy_test.go b/metadata/policy_test.go index 58e19d7..cc6b36f 100644 --- a/metadata/policy_test.go +++ b/metadata/policy_test.go @@ -26,7 +26,7 @@ import ( "reflect" "testing" - . "fscrypt/util" + "github.com/google/fscrypt/util" ) const goodDescriptor = "0123456789abcdef" @@ -38,12 +38,13 @@ var goodPolicy = &PolicyData{ // Creates a temporary directory for testing. func createTestDirectory() (directory string, err error) { - baseDirectory, err := TestPath() + baseDirectory, err := util.TestPath() if err != nil { return } if s, err := os.Stat(baseDirectory); err != nil || !s.IsDir() { - return "", fmt.Errorf("%s: %q is not a valid directory", TestEnvVarName, baseDirectory) + return "", fmt.Errorf("%s: %q is not a valid directory", + util.TestEnvVarName, baseDirectory) } directoryPath := filepath.Join(baseDirectory, "test") |