[devscripts] 01/01: Support xz compressed files in dd-list

Paul Wise pabs at moszumanska.debian.org
Mon Apr 4 10:16:35 UTC 2016


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

pabs pushed a commit to branch master
in repository devscripts.

commit 0b3b999ef721c406bdf5f45e9013ceeca7d73bdb
Author: Paul Wise <pabs at debian.org>
Date:   Mon Apr 4 18:10:19 2016 +0800

    Support xz compressed files in dd-list
---
 debian/changelog   | 1 +
 scripts/dd-list.1  | 8 ++++----
 scripts/dd-list.pl | 6 +++---
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 20b56a6..99ef9da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ devscripts (2.16.3) UNRELEASED; urgency=medium
   [ Paul Wise ]
   * Update chdist bash-completion file with the architectures currently
     (as of 2016-04-02) listed on buildd.debian.org
+  * Support xz compressed files in dd-list
 
  -- James McCoy <jamessan at debian.org>  Sun, 20 Mar 2016 12:26:04 -0400
 
diff --git a/scripts/dd-list.1 b/scripts/dd-list.1
index dfda038..ac1c953 100644
--- a/scripts/dd-list.1
+++ b/scripts/dd-list.1
@@ -76,13 +76,13 @@ output, which might be a binary package name.
 .TP
 .BR \-z ", " \-\-uncompress
 Try to uncompress the \-\-dctrl input before parsing.  Supported compression
-formats are gz and bzip2.
+formats are gz, bzip2 or xz.
 .TP
 \fB\-s\fR, \fB\-\-sources\fR \fISources_file\fR
 Read package information from the specified \fISources_file\fRs.  This can be
-given multiple times.  The files can be gz or bzip2 compressed.  If the
-filename does not end in \fI.gz\fR or \fI.bz2\fR, then the \fB-z\fR option
-must be used.
+given multiple times.  The files can be gz, bzip2 or xz compressed.  If the
+filename does not end in \fI.gz\fR, \fI.bz2\fR or \fI.xz\fR, then the \fB-z\fR
+option must be used.
 .IP
 If no \fISources_file\fRs are specified, any files matching
 \fI/var/lib/apt/lists/*_source_Sources\fR will be used.
diff --git a/scripts/dd-list.pl b/scripts/dd-list.pl
index b450795..71f277c 100755
--- a/scripts/dd-list.pl
+++ b/scripts/dd-list.pl
@@ -67,12 +67,12 @@ Usage: dd-list [options] [package ...]
 
     -z, --uncompress
         Try to uncompress the --dctrl input before parsing.  Supported
-        compression formats are gz and bzip2.
+        compression formats are gz, bzip2 and xz.
 
     -s, --sources SOURCES_FILE
         Read package information from given SOURCES_FILE instead of all files
         matching /var/lib/apt/lists/*_source_Sources.  Can be specified
-        multiple times.  The files can be gz or bzip2 compressed.
+        multiple times.  The files can be gz, bzip2 or xz compressed.
 
     -u, --uploaders
         Also list Uploaders of packages, not only the listed Maintainers
@@ -291,7 +291,7 @@ else {
 	}
 	else
 	{
-	    if ($opt_uncompress || ($uncompress && $source =~ m/\.(?:gz|bz2)$/)) {
+	    if ($opt_uncompress || ($uncompress && $source =~ m/\.(?:gz|bz2|xz)$/)) {
 		$fh = IO::Uncompress::AnyUncompress->new($source);
 	    }
 	    else {

-- 
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