[Dehs-devel] SVN devscripts commit: r317 - in trunk: . debian

Julian Gilbey jdg at costa.debian.org
Sun Feb 12 12:38:12 UTC 2006


Author: jdg
Date: 2006-02-12 12:38:11 +0000 (Sun, 12 Feb 2006)
New Revision: 317

Modified:
   trunk/debian/changelog
   trunk/uscan.pl
Log:
* uscan: check sanity of downloaded files (Closes: #303958)

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2006-02-12 12:24:59 UTC (rev 316)
+++ trunk/debian/changelog	2006-02-12 12:38:11 UTC (rev 317)
@@ -5,8 +5,9 @@
     (Closes: #352476)
   * debcommit: handle commit messages for git-based setups (Closes:
     #352004)
+  * uscan: check sanity of downloaded files (Closes: #303958)
 
- -- Julian Gilbey <jdg at debian.org>  Sun, 12 Feb 2006 12:24:48 +0000
+ -- Julian Gilbey <jdg at debian.org>  Sun, 12 Feb 2006 12:37:51 +0000
 
 devscripts (2.9.12) unstable; urgency=low
 

Modified: trunk/uscan.pl
===================================================================
--- trunk/uscan.pl	2006-02-12 12:24:59 UTC (rev 316)
+++ trunk/uscan.pl	2006-02-12 12:38:11 UTC (rev 317)
@@ -987,6 +987,15 @@
 	}
     }
 
+    if ($newfile_base =~ /\.(tar\.gz|tgz|tar\.bz2|tbz2?)$/) {
+	my $filetype = `file ../$newfile_base`;
+	$filetype =~ s%^\.\./\Q$newfile_base\E: %%;
+	unless ($filetype =~ /compressed data/) {
+	    warn "$progname warning: ../$newfile_base does not appear to be a compressed file;\nthe file command says: $filetype\nNot processing this file any further!\n";
+	    return 1;
+	}
+    }
+
     if ($newfile_base =~ /\.(tar\.gz|tgz)$/) {
 	if ($symlink eq 'symlink') {
 	    symlink $newfile_base, "../${pkg}_${newversion}.orig.tar.gz";




More information about the Dehs-devel mailing list