diff options
Diffstat (limited to 'crates/shirabe/src/package/archiver')
| -rw-r--r-- | crates/shirabe/src/package/archiver/archivable_files_filter.rs | 5 | ||||
| -rw-r--r-- | crates/shirabe/src/package/archiver/phar_archiver.rs | 8 |
2 files changed, 7 insertions, 6 deletions
diff --git a/crates/shirabe/src/package/archiver/archivable_files_filter.rs b/crates/shirabe/src/package/archiver/archivable_files_filter.rs index ee39ba37..02a622f7 100644 --- a/crates/shirabe/src/package/archiver/archivable_files_filter.rs +++ b/crates/shirabe/src/package/archiver/archivable_files_filter.rs @@ -24,11 +24,12 @@ impl ArchivableFilesFilter { true } - pub fn add_empty_dir(&self, phar: &PharData, sources: &str) { + pub fn add_empty_dir(&self, phar: &PharData, sources: &str) -> anyhow::Result<()> { for filepath in &self.dirs { let localname = filepath.replace(&format!("{}/", sources), ""); - phar.add_empty_dir(&localname); + phar.add_empty_dir(&localname)?; } + Ok(()) } } diff --git a/crates/shirabe/src/package/archiver/phar_archiver.rs b/crates/shirabe/src/package/archiver/phar_archiver.rs index 1bac060b..55e4cb95 100644 --- a/crates/shirabe/src/package/archiver/phar_archiver.rs +++ b/crates/shirabe/src/package/archiver/phar_archiver.rs @@ -73,11 +73,11 @@ impl ArchiverInterface for PharArchiver { FilesystemIterator::KEY_AS_PATHNAME | FilesystemIterator::CURRENT_AS_FILEINFO, "", *formats.get(format.as_str()).unwrap_or(&Phar::TAR), - ); + )?; let files = ArchivableFilesFinder::new(&sources, excludes, ignore_filters)?; let mut files_only = ArchivableFilesFilter::new(Box::new(files)); - phar.build_from_iterator(&mut files_only, &sources); - files_only.add_empty_dir(&phar, &sources); + phar.build_from_iterator(&mut files_only, &sources)?; + files_only.add_empty_dir(&phar, &sources)?; if !file_exists(&target) { let target = format!("{}.{}", filename, format); @@ -137,7 +137,7 @@ impl ArchiverInterface for PharArchiver { unlink(&target); - phar.compress(compress_algo); + phar.compress(compress_algo)?; let target = format!("{}.{}", filename, format); return Ok(target); |
