Problem with *.zip archives

[James McCoy]

On Fri, Mar 21, 2014 at 12:34:07PM +0100, Joachim Breitner wrote:
> Am Freitag, den 21.03.2014, 11:53 +0100 schrieb Andreas Tille:
> > > 
> > > So do we need to support zip-to-zip File-Exclusion?
> > 
> > If you ask me - no.
> 
> James, what do you say? You once said
> 
> > Also, zip appears to support the same type of functionality required
> > to do the file exclusion on the archive directly.  Given that
> > Files-Excluded implies a repack, bailing out when the source archive
> > is a zip isn't desired.
> 
> Does that still hold, or is bailing out when the source archive is a zip
> *and the user did not specify --repack* desired?

Why should we error out on the user instead of just inferring that
--repack is needed?

--- a/scripts/uscan.pl
+++ b/scripts/uscan.pl
@@ -1472,7 +1472,7 @@ EOF
                 or uscan_die("$progname warning: OpenPGP signature did not verify.\n");
     }

-    if ($repack and $newfile_base =~ /^(.*)\.(zip|jar)$/) {
+    if (($exclusion or $repack) and $newfile_base =~ /^(.*)\.(zip|jar)$/) {
        my $compress_file_base = "$1.tar" ;
         my $suffix = compression_get_property($repack_compression, "file_ext");
        print "-- Repacking from zip to .tar.$suffix\n" if $verbose;

Maybe I'm misunderstanding the question or the problem that you're presenting.

Cheers,
-- 
James
GPG Key: 4096R/331BA3DB 2011-12-05 James McCoy <jamessan at debian.org>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 949 bytes
Desc: Digital signature
URL: <http://lists.alioth.debian.org/pipermail/devscripts-devel/attachments/20140321/567aeef5/attachment.sig>