tasks/deb.rake in packaging-0.106.0 vs tasks/deb.rake in packaging-0.106.1

@@ -22,11 +22,11 @@
 
 def debuild(args)
   results_dir = args[:work_dir]
   begin
     sh "debuild --no-lintian -uc -us"
-  rescue => e
+  rescue StandardError => e
     fail "Something went wrong. Hopefully the backscroll or #{results_dir}/#{Pkg::Config.project}_#{Pkg::Config.debversion}.build file has a clue.\n#{e}"
   end
 end
 
 task :prep_deb_tars, :work_dir do |t, args|
@@ -45,16 +45,15 @@
   # will fail in nasty ways, so we only do this if the target exists...
   if Pathname('ext/debian').directory?
     pkg_dir = "#{work_dir}/#{Pkg::Config.project}-#{Pkg::Config.debversion}"
     cd 'ext' do
       Pathname('debian').find do |file|
-        case
-        when file.to_s =~ /~$/, file.to_s =~ /^#/
+        if file.to_s =~ /~$/ || file.to_s =~ /^#/
           next
-        when file.directory?
+        elsif file.directory?
           mkdir_p "#{pkg_dir}/#{file}"
-        when file.extname == '.erb'
+        elsif file.extname == '.erb'
           Pkg::Util::File.erb_file(file, "#{pkg_dir}/#{file.sub(/\.[^\.]*$/, '')}", false, :binding => Pkg::Config.get_binding)
         else
           cp file, "#{pkg_dir}/#{file}"
         end
       end
@@ -68,14 +67,14 @@
     deb_build = args.deb_command
     cow       = args.cow
     work_dir  = Pkg::Util::File.mktemp
     subdir    = 'pe/' if Pkg::Config.build_pe
     codename = /base-(.*)-(.*)\.cow/.match(cow)[1] unless cow.nil?
-    dest_dir  = File.join(Pkg::Config.project_root, "pkg", "#{subdir}deb", codename.to_s, subrepo.to_s)
+    dest_dir = File.join(Pkg::Config.project_root, "pkg", "#{subdir}deb", codename.to_s, subrepo.to_s)
     Pkg::Util::Tool.check_tool(deb_build)
     mkdir_p dest_dir
-    deb_args  = { :work_dir => work_dir, :cow => cow }
+    deb_args = { :work_dir => work_dir, :cow => cow }
     Rake::Task[:prep_deb_tars].reenable
     Rake::Task[:prep_deb_tars].invoke(work_dir)
     cd "#{work_dir}/#{Pkg::Config.project}-#{Pkg::Config.debversion}" do
       if !File.directory?('debian') and File.directory?('ext/debian')
         mv 'ext/debian', 'debian'
@@ -110,10 +109,10 @@
   end
 end
 
 namespace :pl do
   desc "Create a deb from this repo using the default cow #{Pkg::Config.default_cow}."
-  task :deb => "package:tar"  do
+  task :deb => "package:tar" do
     Pkg::Util.check_var('PE_VER', Pkg::Config.pe_version) if Pkg::Config.build_pe
     Rake::Task[:build_deb].invoke('pdebuild', Pkg::Config.default_cow)
   end
 
   desc "Create debs from this git repository using all cows specified in build_defaults yaml"