lib/testlab/container/io.rb in testlab-1.9.1 vs lib/testlab/container/io.rb in testlab-1.9.2

@@ -74,11 +74,11 @@
         export_tempfile = Tempfile.new('export')
         remote_filename = File.basename(export_tempfile.path.dup)
         export_tempfile.close!
 
         remote_file  = File.join("", "tmp", remote_filename)
-        local_file ||= File.join(Dir.pwd, File.basename(remote_file))
+        local_file ||= File.join(Dir.pwd, "#{self.id}.sc")
         local_file   = File.expand_path(local_file)
         root_fs_path = self.lxc.fs_root.split(File::SEPARATOR).last
 
         please_wait(:ui => @ui, :message => format_object_action(self, 'Compress', :cyan)) do
           self.node.bootstrap(<<-EOF)
@@ -117,16 +117,15 @@
       #
       # @return [Boolean] True if successful.
       def import(local_file)
         @ui.logger.debug { "Container Import: #{self.id}" }
 
-        local_file ||= File.expand_path("#{self.id}.sc")
-
         import_tempfile = Tempfile.new('import')
         remote_filename = File.basename(import_tempfile.path.dup)
         import_tempfile.close!
 
         remote_file  = File.join("", "tmp", remote_filename)
+        local_file ||= File.join(Dir.pwd, "#{self.id}.sc")
         local_file   = File.expand_path(local_file)
         root_fs_path = self.lxc.fs_root.split(File::SEPARATOR).last
 
         @ui.logger.debug { "Local File: #{local_file.inspect}" }