deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #3001 from nafu/4-2/repo_patch

Browse source 
Fix file_name for archive
This commit is contained in:
Dmitriy Zaporozhets 2013-02-18 07:13:44 -08:00
commit 26e340fc6c
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/models/repository.rb
View file

@ -151,16 +151,16 @@ class Repository
return nil unless commit return nil unless commit
# Build file path # Build file path
file_name = self.path_with_namespace + "-" + commit.id.to_s + ".tar.gz" file_name = self.path_with_namespace.gsub("/","_") + "-" + commit.id.to_s + ".tar.gz"
storage_path = Rails.root.join("tmp", "repositories") storage_path = Rails.root.join("tmp", "repositories")
file_path = File.join(storage_path, file_name) file_path = File.join(storage_path, self.path_with_namespace, file_name)
# Put files into a directory before archiving # Put files into a directory before archiving
prefix = self.path_with_namespace + "/" prefix = self.path_with_namespace + "/"
# Create file if not exists # Create file if not exists
unless File.exists?(file_path) unless File.exists?(file_path)
FileUtils.mkdir_p storage_path FileUtils.mkdir_p File.dirname(file_path)
file = self.repo.archive_to_file(ref, prefix, file_path) file = self.repo.archive_to_file(ref, prefix, file_path)
end end