Support for adding modules from an archive #31
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
vpodzime
force-pushed
the
master-add_archive
branch
from
6001c55
to
fd7dcfb
Compare
olehermanse
requested changes
Oct 22, 2021
cfbs/commands.py
Outdated
Comment on lines
312
to
340
| # TODO: use Python modules instead of CLI tools? | ||
| if archive_type.startswith(_SUPPORTED_TAR_TYPES): | ||
| sh("cd %s; tar -xf %s" % (content_dir, archive_path)) | ||
| elif archive_type == (".zip"): | ||
| sh("cd %s; unzip %s" % (content_dir, archive_path)) | ||
| else: | ||
| raise RuntimeError("Unhandled archive type: '%s'. Please report this at %s." % | ||
| (url, "https://github.com/cfengine/cfbs/issues")) | ||
|
|
||
| os.unlink(archive_path) |
There was a problem hiding this comment.
I guess tar is usually available, but I definitely know that I've had stuff not working because of missing unzip before. A python option would be good.
There was a problem hiding this comment.
Yeah, but TBH, I don't consider that too important for now. If you want to work with .zip archives, you most likely have unzip installed or you can easily install it. I can add a check and a proper error message, though.
.strip("/") also strips leading slashes.
So that it has a better chance working with git repositories that are not at GitHub and various sources in general. Ticket: CFE-3772 Changelog: None
Just like when adding modules from a git repository, but downloading and extracting an archive instead of 'git clone'. The archive needs to contain the 'cfbs.json' index file and one or more modules. Ticket: CFE-3772 Changelog: 'cfbs add' now supports adding modules from archives
Ticket: CFE-3772 Changelog: None
vpodzime
force-pushed
the
master-add_archive
branch
from
fd7dcfb
to
24e97c0
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Just like when adding modules from a git repository.