[DRE-commits] [SCM] gem2deb.git branch, master, updated. debian/0.2.3-35-g72c44bc

Antonio Terceiro terceiro at softwarelivre.org
Sun Jun 19 02:35:47 UTC 2011


The following commit has been merged in the master branch:
commit 9de650ccb70c2db61a3a51bc1f33ff0a6e689689
Author: Antonio Terceiro <terceiro at softwarelivre.org>
Date:   Sat Jun 18 18:04:35 2011 -0700

    Be even more clear about how files are excluded

diff --git a/lib/gem2deb/dh_ruby.rb b/lib/gem2deb/dh_ruby.rb
index 00ef7f1..7ac2bf4 100644
--- a/lib/gem2deb/dh_ruby.rb
+++ b/lib/gem2deb/dh_ruby.rb
@@ -298,13 +298,14 @@ module Gem2Deb
     JUNK_PATTERNS = [ /^#/, /^\.#/, /^cvslog/, /^,/, /^\.del-*/, /\.olb$/,
         /~$/, /\.(old|bak|BAK|orig|rej)$/, /^_\$/, /\$$/, /\.org$/, /\.in$/, /^\./ ]
 
+    DO_NOT_INSTALL = (JUNK_FILES + HOOK_FILES).map { |file| /^#{file}$/ } + JUNK_PATTERNS
 
     def install_files(src, dest, mode)
       run "install -d #{dest}"
       files_to_install = Dir.chdir(src) do
         Dir.glob('**/*').reject do |file|
           filename = File.basename(file)
-          JUNK_FILES.include?(filename) || HOOK_FILES.include?(filename) || (JUNK_PATTERNS.any? { |junk| filename =~ junk })
+          DO_NOT_INSTALL.any? { |pattern| filename =~ pattern }
         end
       end
       files_to_install.each do |fname|

-- 
gem2deb.git



More information about the Pkg-ruby-extras-commits mailing list