lib/foreman/export/base.rb in foreman-0.64.0 vs lib/foreman/export/base.rb in foreman-0.65.0

@@ -44,14 +44,12 @@
   end
 
   def export
     error("Must specify a location") unless location
     FileUtils.mkdir_p(location) rescue error("Could not create: #{location}")
-    FileUtils.mkdir_p(log) rescue error("Could not create: #{log}")
-    FileUtils.mkdir_p(run) rescue error("Could not create: #{run}")
-    FileUtils.chown(user, nil, log) rescue error("Could not chown #{log} to #{user}")
-    FileUtils.chown(user, nil, run) rescue error("Could not chown #{run} to #{user}")
+    chown user, log
+    chown user, run
   end
 
   def app
     options[:app] || "app"
   end
@@ -78,9 +76,15 @@
     puts
     puts "https://github.com/ddollar/foreman/blob/master/lib/foreman/export/upstart.rb"
     puts "https://github.com/ddollar/foreman/blob/master/data/export/upstart/process.conf.erb"
     puts
     @@deprecation_warned = true
+  end
+
+  def chown user, dir
+    FileUtils.chown user, nil, dir
+  rescue
+    error("Could not chown #{dir} to #{user}") unless File.writable? dir
   end
 
   def error(message)
     raise Foreman::Export::Exception.new(message)
   end