[devscripts] 04/10: mk-origtargz: fix Files-Excluded for duplicate entries

Osamu Aoki osamu at moszumanska.debian.org
Thu Oct 15 16:07:06 UTC 2015


This is an automated email from the git hooks/post-receive script.

osamu pushed a commit to branch multitar
in repository devscripts.

commit 5f3e466ee6c7b993f65706eb8b593829a1658898
Author: Osamu Aoki <osamu at debian.org>
Date:   Tue Oct 13 15:07:43 2015 +0000

    mk-origtargz: fix Files-Excluded for duplicate entries
    
    Patch by: Kan-Ru Chen (陳侃如) <koster at debian.org>
    Closes: #762263
---
 scripts/mk-origtargz.pl | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/mk-origtargz.pl b/scripts/mk-origtargz.pl
index 7a212d6..3c1db9e 100644
--- a/scripts/mk-origtargz.pl
+++ b/scripts/mk-origtargz.pl
@@ -180,6 +180,7 @@ use Devscripts::Compression qw/compression_is_supported compression_guess_from_f
 use Cwd 'abs_path';
 use File::Copy;
 use Dpkg::Control::Hash;
+use List::MoreUtils qw(uniq);
 
 sub decompress_archive($$);
 sub compress_archive($$$);
@@ -467,6 +468,7 @@ if (@exclude_globs) {
     # ensure files are mentioned before the directory they live in
     # (otherwise tar complains)
     @to_delete = sort {$b cmp $a}  @to_delete;
+    @to_delete = uniq  @to_delete;
 
     $deletecount = scalar(@to_delete);
 }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/devscripts.git



More information about the devscripts-devel mailing list