diff options
| author | Bill Wendling <morbo@google.com> | 2017-09-20 22:17:14 -0700 |
|---|---|---|
| committer | Bill Wendling <morbo@google.com> | 2017-09-20 22:17:14 -0700 |
| commit | 0c9a1b19bedc4a28d55ab5760576d66c3152cdb2 (patch) | |
| tree | 678b1058f5e6a66625bc6de23f1585ad4d1e1e98 /serializer | |
| parent | b4bef120db43d350999163efd6bb991c9e68b59d (diff) | |
| download | licenseclassifier-0c9a1b19bedc4a28d55ab5760576d66c3152cdb2.tar.gz | |
Update to use the proper path for ReadLicenseFile
Diffstat (limited to 'serializer')
| -rw-r--r-- | serializer/serializer.go | 2 | ||||
| -rw-r--r-- | serializer/serializer_test.go | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/serializer/serializer.go b/serializer/serializer.go index f4cbfd1..24c86ca 100644 --- a/serializer/serializer.go +++ b/serializer/serializer.go @@ -45,7 +45,7 @@ func ArchiveLicenses(licenses []string, w io.Writer) error { continue } - contents, err := licenseclassifier.ReadLicenseFile(filepath.Join(licenseclassifier.LicenseDirectory, license)) + contents, err := licenseclassifier.ReadLicenseFile(license) if err != nil { return err } diff --git a/serializer/serializer_test.go b/serializer/serializer_test.go index 6af0b46..1bca727 100644 --- a/serializer/serializer_test.go +++ b/serializer/serializer_test.go @@ -21,7 +21,6 @@ import ( "io" "log" "os" - "path/filepath" "reflect" "sort" "strings" @@ -38,13 +37,13 @@ var ( func TestMain(m *testing.M) { var err error - apache20Header, err = licenseclassifier.ReadLicenseFile(filepath.Join(licenseclassifier.LicenseDirectory, "Apache-2.0.header.txt")) + apache20Header, err = licenseclassifier.ReadLicenseFile("Apache-2.0.header.txt") if err != nil { log.Fatalf("error reading contents of Apache-2.0.header.txt: %v", err) } normApache = normalize(string(apache20Header)) - mit, err = licenseclassifier.ReadLicenseFile(filepath.Join(licenseclassifier.LicenseDirectory, "MIT.txt")) + mit, err = licenseclassifier.ReadLicenseFile("MIT.txt") if err != nil { log.Fatalf("error reading contents of MIT.txt: %v", err) } |