lib/autobuild/packages/python.rb in autobuild-1.17.0 vs lib/autobuild/packages/python.rb in autobuild-1.18.0
- old
+ new
@@ -54,17 +54,21 @@
'python -m site --user-site')
rescue Exception => e
raise "Unable to set PYTHONPATH: #{e.message}"
end
- return output.read.chomp if ret.value.success?
- raise 'Unable to set PYTHONPATH: user site directory disabled?'
+ if ret.value.success?
+ output.read.chomp
+ else
+ raise 'Unable to set PYTHONPATH: user site directory disabled?'
+ end
end
# Do the build in builddir
def build
return unless @install_mode
+
command = generate_build_command
command << '--force' if @forced
progress_start 'building %s [progress not available]',
done_message: 'built %s' do
run 'build', *command, working_directory: srcdir
@@ -73,9 +77,10 @@
end
# Install the result in prefix
def install
return unless @install_mode
+
command = generate_install_command
command << '--force' if @forced
progress_start 'installing %s',
done_message: 'installed %s' do
run 'install', *command, working_directory: srcdir