Skip to content

Commit

Permalink
Always replace the placeholder for extra depends (#260)
Browse files Browse the repository at this point in the history
  • Loading branch information
treydock committed Oct 19, 2023
1 parent d44d977 commit 43b39cf
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
ood_packaging (0.13.3)
ood_packaging (0.13.4)
rake (~> 13.0.1)

GEM
Expand Down
6 changes: 4 additions & 2 deletions lib/ood_packaging/build.rb
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,9 @@ def install_rpm_dependencies!
def install_deb_dependencies!
sh "sudo apt update -y#{cmd_suffix}"
extra_depends = config.fetch(:extra_depends, nil)
unless extra_depends.nil?
if extra_depends.nil?
extra_depends = ''
else
extra_depends = extra_depends.split(',').map(&:strip) if extra_depends.is_a?(String)
extra_depends.unshift('')
extra_depends = extra_depends.join(', ')
Expand All @@ -296,7 +298,7 @@ def install_deb_dependencies!
"#{package}-build-deps*.changes"
]
Dir.chdir(deb_work_dir) do
sh "sed -i 's|@EXTRA_DEPENDS@|#{extra_depends}|g' debian/control#{cmd_suffix}" unless extra_depends.nil?
sh "sed -i 's|@EXTRA_DEPENDS@|#{extra_depends}|g' debian/control#{cmd_suffix}"
sh "#{cmd.join(' ')}#{cmd_suffix}"
sh "rm -f #{cleanup.join(' ')}#{cmd_suffix}"
end
Expand Down
2 changes: 1 addition & 1 deletion lib/ood_packaging/version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# Version code for OodPackaging
module OodPackaging
VERSION = '0.13.3'
VERSION = '0.13.4'
PACKAGE_VERSION = {
'ondemand-release' => {
'(ubuntu|debian)' => '3.1.0',
Expand Down
2 changes: 1 addition & 1 deletion spec/ood_packaging/build_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@

it 'installs DEB dependencies using apt' do
expect(build).to receive(:sh).with('sudo apt update -y 2>/dev/null 1>/dev/null')
expect(build).not_to receive(:sh).with(/^sed.+/)
expect(build).to receive(:sh).with("sed -i 's|@EXTRA_DEPENDS@||g' debian/control#{cmd_suffix}")
expect(build).to receive(:sh).with(expected_cmd.join(' '))
expect(build).to receive(:sh).with("rm -f #{cleanup.join(' ')} 2>/dev/null 1>/dev/null")
build.install_dependencies!
Expand Down

0 comments on commit 43b39cf

Please sign in to comment.