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

Add interfaces that were removed from upstream but containers/image uses #105

Merged
merged 1 commit into from
Sep 13, 2017

Conversation

rhatdan
Copy link
Member

@rhatdan rhatdan commented Sep 13, 2017

Add back in these interfaces since containers/image is using.
archive.UntartPath
archive.IsArchive

Also add back this constant for containers/image.
archive.HeaderSize

Signed-off-by: Daniel J Walsh dwalsh@redhat.com

@rhatdan
Copy link
Member Author

rhatdan commented Sep 13, 2017

cri-o/cri-o#899 is blowing up since these interfaces were removed. We can eventually fix containers/image to not use the interfaces, but for now, I think it makes more sense to add them back.

@rhatdan
Copy link
Member Author

rhatdan commented Sep 13, 2017

@nalind @mtrmac @umohnani8 PTAL

@umohnani8
Copy link
Member

Code LGTM but Travis is not happy.

// UntarPath is a convenience function which looks for an archive
// at filesystem path `src`, and unpacks it at `dst`.
func UntarPath(src, dst string) error {
return defaultArchiver.UntarPath(src, dst)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Try NewDefaultArchiver().UntarPath(src, dst) here.

Add back in these interfaces since containers/image is using.
archive.UntartPath
archive.IsArchive

Also add back this constant for containers/image.
archive.HeaderSize

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
@mtrmac
Copy link
Collaborator

mtrmac commented Sep 13, 2017

ACK.

@nalind
Copy link
Member

nalind commented Sep 13, 2017

LGTM.

@rhatdan
Copy link
Member Author

rhatdan commented Sep 13, 2017

Merging

@rhatdan rhatdan merged commit 9c85fa7 into containers:master Sep 13, 2017
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.

4 participants