Skip to content

Commit

Permalink
*: clean some old deprecated comments
Browse files Browse the repository at this point in the history
There were various references to patched versions of go-mtree, but all
mentioned fixes are now in the upstream version that umoci is using.

Signed-off-by: Jonathan Boulle <jonathanboulle@gmail.com>
  • Loading branch information
jonboulle authored and cyphar committed Oct 24, 2017
1 parent 8de2651 commit f756364
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 12 deletions.
5 changes: 0 additions & 5 deletions oci/layer/generate.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,6 @@ import (
"github.com/vbatts/go-mtree"
)

// NOTE: This currently requires a version of go-mtree which has my Compare()
// PR added. While we don't use this interface here, my work also
// implemented the InodeDelta and supporting interfaces. Hopefully my PR
// will be merged soon. https://github.com/vbatts/go-mtree/pull/48

// inodeDeltas is a wrapper around []mtree.InodeDelta that allows for sorting
// the set of deltas by the pathname.
type inodeDeltas []mtree.InodeDelta
Expand Down
10 changes: 5 additions & 5 deletions test/helpers.bash
Original file line number Diff line number Diff line change
Expand Up @@ -101,11 +101,11 @@ function umoci() {
function gomtree() {
local args=("$@")

# We're rootless. Note that this is _not_ available from the upstream
# version of go-mtree. It's a feature I implemented in the library for
# umoci's support, and is currently being proposed in
# https://github.com/vbatts/go-mtree/pull/96. I would not hold my breath
# that it'll be merged any time soon.
# We're rootless. Note that this is _not_ available in the upstream
# version of go-mtree and is unlikely to be accepted there (see
# https://github.com/vbatts/go-mtree/pull/96).
# It's maintained instead as an openSUSE extension:
# https://build.opensuse.org/package/view_file/Virtualization:containers/go-mtree/0001-gomtree-add-rootless-flag.patch?expand=1
if [[ "$ROOTLESS" != 0 ]]; then
args+=("-rootless")
fi
Expand Down
2 changes: 0 additions & 2 deletions test/repack.bats
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ function teardown() {
echo "first file" > "$BUNDLE_A/rootfs/newfile"
mkdir "$BUNDLE_A/rootfs/newdir"
echo "subfile" > "$BUNDLE_A/rootfs/newdir/anotherfile"
# this currently breaks go-mtree but I've backported a patch to fix it in openSUSE
ln -s "this is a dummy symlink" "$BUNDLE_A/rootfs/newdir/link"

# Repack the image under a new tag.
Expand Down Expand Up @@ -184,7 +183,6 @@ function teardown() {
chmod +w "$BUNDLE_A/rootfs/bin/." && rm "$BUNDLE_A/rootfs/bin/sh"
mkdir "$BUNDLE_A/rootfs/bin/sh"
chmod +w "$BUNDLE_A/rootfs/usr/bin/." && rm "$BUNDLE_A/rootfs/usr/bin/env"
# this currently breaks go-mtree but I've backported a patch to fix it in openSUSE
ln -s "a \\really //weird _00..:=path " "$BUNDLE_A/rootfs/usr/bin/env"

# Repack the image under the same tag.
Expand Down

0 comments on commit f756364

Please sign in to comment.