Просмотр исходного кода

dpkg-source: improve ignore regexp to catch vi swap files

dpkg-source now ignores all possible vi swap file extensions (and not only
.swp). The corresponding exclude pattern for -I also got tightened to only
catch filenames starting with a dot. Closes: #515540
Raphael Hertzog лет назад: 17
Родитель
Сommit
acb9b6e9f2
2 измененных файлов с 5 добавлено и 2 удалено
  1. 3 0
      debian/changelog
  2. 2 2
      scripts/Dpkg/Source/Package.pm

+ 3 - 0
debian/changelog

@@ -18,6 +18,9 @@ dpkg (1.15.1) UNRELEASED; urgency=low
     Architecture field is missing in a binary package. Closes: #510282
   * Modify Dpkg::Version::check_version() to not die by default.
     Closes: #510615
+  * dpkg-source now ignores all possible vi swap file extensions (and not
+    only .swp). The corresponding exclude pattern for -I also got tightened to
+    only catch filenames starting with a dot. Closes: #515540
 
   [ Guillem Jover ]
   * Fix typo in dpkg output (‘unexecpted’ → ‘unexpected’). Closes: #519082

+ 2 - 2
scripts/Dpkg/Source/Package.pm

@@ -41,7 +41,7 @@ our $diff_ignore_default_regexp = '
 # Ignore emacs recovery files
 (?:^|/)\.#.*$|
 # Ignore vi swap files
-(?:^|/)\..*\.swp$|
+(?:^|/)\..*\.sw.$|
 # Ignore baz-style junk files or directories
 (?:^|/),,.*(?:$|/.*$)|
 # File-names that should be ignored (never directories)
@@ -59,7 +59,7 @@ our @tar_ignore_default_pattern = qw(
 *.la
 *.o
 *.so
-*.swp
+.*.sw?
 *~
 ,,*
 .[#~]*