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

abe pushed a commit to branch master
in repository lintian.

commit 454eb1f17f8294e02d9a8fb1cf65bfda5e68dea3
Author: Axel Beckert <a...@deuxchevaux.org>
Date:   Fri Apr 17 00:37:04 2015 +0200

    Hardcode aspell as spelling command
    
    Test::Spelling prefers spell over aspell, which breaks the tests from
    t/scripts/pod-spelling.t if spell is installed, too. This solution
    avoids having to add a "Build-Conflicts: spell".
    
    Signed-off-by: Axel Beckert <a...@deuxchevaux.org>
---
 debian/changelog         | 4 ++++
 t/scripts/pod-spelling.t | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 1052062..115acff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -190,6 +190,10 @@ lintian (2.5.31) UNRELEASED; urgency=medium
   * t:
     + [NT] Apply patch from Matt Kraai to fix test case on
       i386.  (Closes: #771113)
+  * t/scripts/pod-spelling.t:
+    + [AB] Hardcode aspell as spelling command as Test::Spelling prefers
+      spell over aspell if installed, too. This avoids having to add a
+      "Build-Conflicts: spell".
 
  -- Niels Thykier <ni...@thykier.net>  Sun, 09 Nov 2014 15:25:04 +0100
 
diff --git a/t/scripts/pod-spelling.t b/t/scripts/pod-spelling.t
index 8ec50b1..b20de46 100755
--- a/t/scripts/pod-spelling.t
+++ b/t/scripts/pod-spelling.t
@@ -32,6 +32,10 @@ my @GOOD_WORDS = grep {$_ ne ''} map {
 
 add_stopwords(@GOOD_WORDS);
 
+# Hardcode spelling command as Test::Spelling prefers spell over
+# aspell if installed, too. This avoids a "Build-Conflicts: spell".
+set_spell_cmd('aspell list -l en -p /dev/null');
+
 chdir($ENV{'LINTIAN_TEST_ROOT'}//'.')
   or die("fatal error: could not chdir to $ENV{LINTIAN_TEST_ROOT}: $!");
 

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


-- 
To UNSUBSCRIBE, email to debian-lint-maint-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1yisr8-00071i...@moszumanska.debian.org

Reply via email to