diff options
| author | Radostin Stoyanov <rstoyanov1@gmail.com> | 2017-08-26 21:41:55 +0100 |
|---|---|---|
| committer | Radostin Stoyanov <rstoyanov1@gmail.com> | 2017-08-28 15:58:39 +0100 |
| commit | 376dd96934de59d72db5fde376533bcba2bdc670 (patch) | |
| tree | 3a4d269119ef2efab4aa0edcad4f0aef8ae78204 /src/virtBootstrap/sources/file_source.py | |
| parent | e9826e1a29dd045a1a6c680d0d709906da13488b (diff) | |
| download | virt-bootstrap.git-376dd96934de59d72db5fde376533bcba2bdc670.tar.gz virt-bootstrap.git-376dd96934de59d72db5fde376533bcba2bdc670.tar.xz virt-bootstrap.git-376dd96934de59d72db5fde376533bcba2bdc670.zip | |
DockerSource: Split checksum and layers
The current implementation store in one list:
- checksum
- checksum type
- file path
- file size
However, the information about checksum and checksum type is only used
to verify the content of tarball before it is being extracted. Splitting
these into separate lists would allow us to reuse the function
untar_layers() with FileSource.
Diffstat (limited to 'src/virtBootstrap/sources/file_source.py')
| -rw-r--r-- | src/virtBootstrap/sources/file_source.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/virtBootstrap/sources/file_source.py b/src/virtBootstrap/sources/file_source.py index c02f735..412db8a 100644 --- a/src/virtBootstrap/sources/file_source.py +++ b/src/virtBootstrap/sources/file_source.py @@ -57,10 +57,11 @@ class FileSource(object): if not os.path.isfile(self.path): raise Exception('Invalid file source "%s"' % self.path) + layer = [[self.path, os.path.getsize(self.path)]] if self.output_format == 'dir': self.progress("Extracting files into destination directory", value=0, logger=logger) - utils.safe_untar(self.path, dest) + utils.untar_layers(layer, dest, self.progress) elif self.output_format == 'qcow2': # Remove the old path |