The following commit has been merged in the master branch:
commit d53b85ed13ee27affc74f517cdec70829b816931
Author: Benjamin Drung <[email protected]>
Date: Fri Dec 23 13:44:20 2011 +0100
wrap-and-sort: Do not sort executable files (executable .install files
could be programs since debhelper 8.9.12).
Thanks: Stefano Rivera
diff --git a/debian/changelog b/debian/changelog
index 5528d2e..0821119 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,7 +16,11 @@ devscripts (2.11.3) UNRELEASED; urgency=low
+ Handle filenames with special characters. (Closes: #648299)
* debdiff: Handle paths with special characters. (Closes: #571528)
- -- David Prévot <[email protected]> Sat, 03 Dec 2011 11:39:52 -0400
+ [ Benjamin Drung ]
+ * wrap-and-sort: Do not sort executable files (executable .install files
could
+ be programs since debhelper 8.9.12). Thanks to Stefano Rivera for the
patch.
+
+ -- Benjamin Drung <[email protected]> Fri, 23 Dec 2011 13:36:54 +0100
devscripts (2.11.2) unstable; urgency=low
diff --git a/scripts/wrap-and-sort b/scripts/wrap-and-sort
index 9889b75..cb7ec85 100755
--- a/scripts/wrap-and-sort
+++ b/scripts/wrap-and-sort
@@ -163,7 +163,9 @@ def get_files(debian_directory):
"""Returns a list of files that should be wrapped and sorted."""
files = []
for supported_files in SUPPORTED_FILES:
- files.extend(glob.glob(os.path.join(debian_directory,
supported_files)))
+ file_pattern = os.path.join(debian_directory, supported_files)
+ files.extend(file_name for file_name in glob.glob(file_pattern)
+ if not os.access(file_name, os.X_OK))
return files
def main():
--
Git repository for devscripts
--
To unsubscribe, send mail to [email protected].
