Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
P
paperclip
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ikcrm_common
paperclip
Commits
f8c24445
Commit
f8c24445
authored
Feb 06, 2012
by
Kelley Reynolds
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove unnecessary mv/unlink from Filesystem#flush_writes, complicates some failure modes
parent
772c8e96
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 additions
and
8 deletions
+1
-8
lib/paperclip/storage/filesystem.rb
+1
-6
test/integration_test.rb
+0
-2
No files found.
lib/paperclip/storage/filesystem.rb
View file @
f8c24445
...
@@ -38,12 +38,7 @@ module Paperclip
...
@@ -38,12 +38,7 @@ module Paperclip
file
.
close
file
.
close
FileUtils
.
mkdir_p
(
File
.
dirname
(
path
(
style_name
)))
FileUtils
.
mkdir_p
(
File
.
dirname
(
path
(
style_name
)))
log
(
"saving
#{
path
(
style_name
)
}
"
)
log
(
"saving
#{
path
(
style_name
)
}
"
)
begin
FileUtils
.
cp
(
file
.
path
,
path
(
style_name
))
FileUtils
.
mv
(
file
.
path
,
path
(
style_name
))
rescue
SystemCallError
FileUtils
.
cp
(
file
.
path
,
path
(
style_name
))
FileUtils
.
rm
(
file
.
path
)
end
FileUtils
.
chmod
(
0666
&~
File
.
umask
,
path
(
style_name
))
FileUtils
.
chmod
(
0666
&~
File
.
umask
,
path
(
style_name
))
end
end
...
...
test/integration_test.rb
View file @
f8c24445
...
@@ -81,8 +81,6 @@ class IntegrationTest < Test::Unit::TestCase
...
@@ -81,8 +81,6 @@ class IntegrationTest < Test::Unit::TestCase
original
.
close
original
.
close
tf
.
rewind
tf
.
rewind
File
.
expects
(
:unlink
).
with
(
tf
.
instance_variable_get
(
:@tmpname
))
@d2
.
avatar
.
expects
(
:to_file
).
with
(
:original
).
returns
(
tf
)
@d2
.
avatar
.
expects
(
:to_file
).
with
(
:original
).
returns
(
tf
)
@d2
.
avatar
.
reprocess!
@d2
.
avatar
.
reprocess!
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment