Skip to content

Commit f92a344

Browse files
committed
fix specs
1 parent 408f9d3 commit f92a344

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

lib/rubygems/package.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -441,13 +441,13 @@ def extract_tar_gz(io, destination_dir, pattern = "*") # :nodoc:
441441
full_name = entry.full_name
442442
next unless File.fnmatch pattern, full_name, File::FNM_DOTMATCH
443443

444-
destination = install_location full_name, destination_dir
445-
446444
if invalid_windows_filename?(full_name)
447445
gem_name = @spec ? @spec.full_name : "unknown"
448446
raise Gem::Package::InvalidWindowsFileNameError.new(full_name, gem_name)
449447
end
450448

449+
destination = install_location full_name, destination_dir
450+
451451
if entry.symlink?
452452
link_target = entry.header.linkname
453453
real_destination = link_target.start_with?("/") ? link_target : File.expand_path(link_target, File.dirname(destination))

test/rubygems/test_gem_package.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1370,7 +1370,7 @@ def test_build_warns_on_invalid_windows_filename
13701370
package.build
13711371
end
13721372

1373-
assert_match(/filename 'lib\/file:name\.rb' contains characters that are invalid on Windows/, ui.error)
1373+
assert_match(%r{filename 'lib/file:name\.rb' contains characters that are invalid on Windows}, ui.error)
13741374
assert_match(/This gem may fail to install on Windows/, ui.error)
13751375
assert_path_exist spec.file_name
13761376
end

0 commit comments

Comments
 (0)