lib/testlab/container/io.rb in testlab-0.7.5 vs lib/testlab/container/io.rb in testlab-0.7.6
- old
+ new
@@ -12,12 +12,13 @@
(self.lxc.state == :not_created) and return false
self.down
- sc_file = %(/tmp/#{self.id}.sc)
+ sc_file = %(/tmp/#{self.id}.sc)
local_file ||= File.join(Dir.pwd, File.basename(sc_file))
+ local_file = File.expand_path(local_file)
please_wait(:ui => @ui, :message => format_object_action(self, 'Compress', :cyan)) do
self.node.ssh.bootstrap(<<-EOF)
set -x
set -e
@@ -46,10 +47,11 @@
@ui.logger.debug { "Container Import: #{self.id} " }
self.down
self.destroy
- sc_file = %(/tmp/#{self.id}.sc)
+ sc_file = %(/tmp/#{self.id}.sc)
+ local_file = File.expand_path(local_file)
please_wait(:ui => @ui, :message => format_object_action(self, 'Import', :cyan)) do
self.node.ssh.exec(%(sudo rm -fv #{sc_file}), :silence => true, :ignore_exit_status => true)
self.node.ssh.upload(local_file, sc_file)
end