[devscripts] 03/04: wrap-and-sort: Remove empty lines from debhelper-related files

[James McCoy]

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

jamessan pushed a commit to branch master
in repository devscripts.

commit e2c826b9e0fcf854d14a8d099527c6c39d2fb7fd
Author: James McCoy <jamessan at debian.org>
Date:   Tue Apr 28 22:50:13 2015 -0400

    wrap-and-sort: Remove empty lines from debhelper-related files
    
    Signed-off-by: James McCoy <jamessan at debian.org>
---
 debian/changelog      | 6 ++++--
 scripts/wrap-and-sort | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6f8f66b..927fcc1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,10 @@ devscripts (2.15.5) UNRELEASED; urgency=medium
     (Closes: #783634)
 
   [ James McCoy ]
-  * wrap-and-sort: Always remove empty elements from lists so “-t” doesn't add
-    a new, empty element.  (Closes: #783630)
+  * wrap-and-sort:
+    + Always remove empty elements from lists so “-t” doesn't add a new, empty
+      element.  (Closes: #783630)
+    + Remove empty lines in debhelper-related files.  (Closes: #780667)
 
  -- Cyril Brulebois <kibi at debian.org>  Tue, 28 Apr 2015 16:58:36 +0200
 
diff --git a/scripts/wrap-and-sort b/scripts/wrap-and-sort
index 46d21c3..f3a7e55 100755
--- a/scripts/wrap-and-sort
+++ b/scripts/wrap-and-sort
@@ -130,7 +130,7 @@ class Install(object):
     def open(self, filename):
         assert os.path.isfile(filename), "%s does not exist." % (filename)
         self.filename = filename
-        self.content = [l.strip() for l in open(filename).readlines()]
+        self.content = list(filter(None, [l.strip() for l in open(filename).readlines()]))
 
     def save(self, filename=None):
         if filename:

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