diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-19 15:44:42 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-19 15:44:42 +0000 |
commit | 4555e1b21c365ed8303ffb7a3325d773c9b8bf31 (patch) | |
tree | 5423a1c7516cffe36384133ade12572cf709398d /lib/safe_zip | |
parent | e570267f2f6b326480d284e0164a6464ba4081bc (diff) | |
download | gitlab-ce-4555e1b21c365ed8303ffb7a3325d773c9b8bf31.tar.gz |
Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42
Diffstat (limited to 'lib/safe_zip')
-rw-r--r-- | lib/safe_zip/entry.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/safe_zip/entry.rb b/lib/safe_zip/entry.rb index 664e2f52f91..52d70e83154 100644 --- a/lib/safe_zip/entry.rb +++ b/lib/safe_zip/entry.rb @@ -44,7 +44,7 @@ module SafeZip end rescue SafeZip::Extract::Error raise - rescue => e + rescue StandardError => e raise SafeZip::Extract::ExtractError, e.message end @@ -90,7 +90,7 @@ module SafeZip def expand_symlink(source_path) ::File.realpath(source_path, path_dir) - rescue + rescue StandardError raise SafeZip::Extract::SymlinkSourceDoesNotExistError, "Symlink source #{source_path} does not exist" end end |