diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-31 09:10:11 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-31 09:10:11 +0300 |
| commit | a45caca38668412d5aa14e0c2bcce946b2b8967e (patch) | |
| tree | 3d881bf9d225b3b55d1e17893504bdc07f788dc1 /app/uploaders/packages | |
| parent | fb657a511abda2481724f0444c1029e6c2158672 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/uploaders/packages')
| -rw-r--r-- | app/uploaders/packages/package_file_uploader.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/uploaders/packages/package_file_uploader.rb b/app/uploaders/packages/package_file_uploader.rb index 61fbe2b4c49..4b6dbe5b358 100644 --- a/app/uploaders/packages/package_file_uploader.rb +++ b/app/uploaders/packages/package_file_uploader.rb @@ -22,6 +22,8 @@ class Packages::PackageFileUploader < GitlabUploader def dynamic_segment raise ObjectNotReadyError, "Package model not ready" unless model.id - Gitlab::HashedPath.new('packages', model.package.id, 'files', model.id, root_hash: model.package.project_id) + package_segment = model.package.debian? ? 'debian' : model.package.id + + Gitlab::HashedPath.new('packages', package_segment, 'files', model.id, root_hash: model.package.project_id) end end |