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.

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

vendor: Replace Sirupsen/logrus with sirupsen/logrus #144

Merged
merged 1 commit into from
Nov 3, 2017

Conversation

wking
Copy link
Contributor

@wking wking commented Nov 3, 2017

With:

$ git mv vendor/github.com/{S,s}irupsen
$ sed -i 's/Sirupsen/sirupsen/g' $(git grep -l Sirupsen)

catching up with the upstream lowercasing. Because of the compatibility issues discussed here, some consumers may prefer to use the old uppercase version until they have time to update their other Logrus consumers to the new lowercase form.

@wking wking force-pushed the lowercase-sirupsen branch from 126a3cb to 72ac04e Compare November 3, 2017 19:17
With:

  $ git mv vendor/github.com/{S,s}irupsen
  $ sed -i 's/Sirupsen/sirupsen/g' $(git grep -l Sirupsen)

catching up with the upstream lowercasing [1,2,3,4].  Because of the
compatibility issues discussed in [3], some consumers may prefer to
use the old uppercase version until they have time to update their
other Logrus consumers to the new lowercase form.

[1]: https://github.com/sirupsen/logrus/blame/v1.0.3/README.md#L6
[2]: sirupsen/logrus#384
[3]: sirupsen/logrus#570 (comment)
[4]: sirupsen/logrus#553
@vbatts
Copy link
Owner

vbatts commented Nov 3, 2017

LGTM

@vbatts vbatts merged commit 005af4d into vbatts:master Nov 3, 2017
@wking wking deleted the lowercase-sirupsen branch November 4, 2017 05:02
wking added a commit to wking/umoci that referenced this pull request Nov 4, 2017
This commit hard-codes the blobs/{algorithm}/{encoded} template [1],
but sets the stage for future work to relax that positioning [2].

I'm adding a PutIndex call in the tests, becase the CAS implementation
now has its own temp directory which is not known to the dirEngine.
Casengine's dir implementation does not use .umoci-* temporary
directories (it uses .casengine-* temporary directories), so it's
protected from Clean.  And the .casengine-* implementation does not
currently provide it's own Clean() implementation, although I may add
that in the future.

The "Deprecated:" syntax is discussed in [3,4,5].

Also adjust Close() to return the first error it encounters, but to
continue to optimistically attempt the remaining cleanup, logging any
subsequent errors.

Bumping go-mtree pulls in [6] and gives us a lowercase sirupsen import
that is compatible with oci-discovery and casengine.

[1]: https://github.com/opencontainers/image-spec/blob/v1.0.0/image-layout.md#blobs
[2]: https://github.com/openSUSE/umoci/pull/190
[3]: https://blog.golang.org/godoc-documenting-go-code
[4]: golang/blog@257114a
[5]: golang/go#10909
[6]: vbatts/go-mtree#144

Signed-off-by: W. Trevor King <wking@tremily.us>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants