[Reproducible-commits] [dpkg] 03/09: dpkg-source: fail if several orig.tar files are available

[Holger Levsen]

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

holger pushed a commit to annotated tag 1.14.28
in repository dpkg.

commit 11ce20d3975f7f2551a42aef267a9b13c6f106a1
Author: Raphaël Hertzog <hertzog at debian.org>
Date:   Sun Nov 22 16:34:11 2009 +0100

    dpkg-source: fail if several orig.tar files are available
    
    This concerns formats 2.0 and 3.0 (quilt) where the upstream tarball can
    be available with different compression schemes. We need precisely one
    file otherwise it doesn't know which one should be used and might pick the
    wrong one.
---
 debian/changelog                  | 3 +++
 scripts/Dpkg/Source/Package/V2.pm | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index abfe698..cbad010 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ dpkg (1.14.28) UNRELEASED; urgency=low
     - fix dpkg-source to not complain on binary files that are ignored and are
       not going to be included in the debian tarball of a "3.0 (quilt)" source
       package. Closes: #524375
+    - let dpkg-source fail if several upstream orig.tar files are
+      available (using different compression scheme) since we don't know
+      which one to use.
 
  -- Raphael Hertzog <hertzog at debian.org>  Sun, 03 Jan 2010 18:21:35 +0100
 
diff --git a/scripts/Dpkg/Source/Package/V2.pm b/scripts/Dpkg/Source/Package/V2.pm
index 371adea..d4d6dd3 100644
--- a/scripts/Dpkg/Source/Package/V2.pm
+++ b/scripts/Dpkg/Source/Package/V2.pm
@@ -245,6 +245,10 @@ sub do_build {
     my @origtarballs;
     foreach (sort $self->find_original_tarballs()) {
         if (/\.orig\.tar\.$comp_regex$/) {
+            if (defined($tarfile)) {
+                error(_g("several orig.tar files found (%s and %s) but only " .
+                         "one is allowed"), $tarfile, $_);
+            }
             $tarfile = $_;
             push @origtarballs, $_;
             $self->add_file($_);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/dpkg.git