upload_folder.rb in lxd-common-0.7.0

- old
+ new

@@ -34,11 +34,12 @@
                 fname = '/tmp/' + File.basename(tfile.path) + ".tar#{ext}"
                 upload_file tfile.path, fname
                 # TODO: serious: make sure the tar extract does an overwrite of existing files
                 #   multiple converge support as well as CI cycle/dev updated files get updated instead of .1 suffixed (?)
                 #   I think I need a flag (it's been a while)
-                execute("bash -c 'mkdir -p #{path} && cd #{path} && tar -xf #{fname} && rm -rf #{fname}'").error!
+                # TODO: explore the chmod & make the same as if uploaded via CLI
+                execute("bash -c 'mkdir -p #{path} && cd #{path} && tar -xf #{fname} && rm -rf #{fname} && chmod -R 600 #{File.basename(local_path)}'").error!
               ensure
                 tfile.unlink
               end
             end
 
@@ -46,13 +47,13 @@
 
             def can_archive?
               return false if @can_archive == false
               @can_archive ||= begin
                                   # I don't want to code tarball logic into the mock transport
-                                  return false if respond_to?(:hk) && hk.respond_to?(:mock)
+                                  return false if respond_to?(:api) && api.respond_to?(:mock)
                                   return false if respond_to?(:inner_transport) && inner_transport.respond_to?(:mock)
                                   return false if respond_to?(:inner_transport) && inner_transport.respond_to?(:inner_transport) && inner_transport.inner_transport.respond_to?(:mock)
-                                  return false if respond_to?(:inner_transport) && inner_transport.respond_to?(:hk) && inner_transport.hk.respond_to?(:mock)
+                                  return false if respond_to?(:inner_transport) && inner_transport.respond_to?(:api) && inner_transport.api.respond_to?(:mock)
                                   `tar --version`
                                   true
                                 rescue
                                   false
                                 end