diff options
| author | Raphaël Hertzog <hertzog@debian.org> | 2009-11-29 17:02:08 +0100 |
|---|---|---|
| committer | Raphaël Hertzog <hertzog@debian.org> | 2009-11-29 17:02:08 +0100 |
| commit | 0fc211581b9bfbc2b1575d4bd79fa06fc30d6083 (patch) | |
| tree | 31ed6a7c8e2918fa4c1d7d00bc1deb63e61cbec4 /scripts/Dpkg/Source/Package/V2.pm | |
| parent | abf378780102adedb7d13f4d36a1641d8856499e (diff) | |
| parent | b6a2926a1670d28583ad38c43981fb2f425057de (diff) | |
| download | dpkg-0fc211581b9bfbc2b1575d4bd79fa06fc30d6083.tar.gz | |
Merge sid branch through commit '1.15.5.3'
Conflicts:
man/po/de.po
man/po/sv.po
scripts/dpkg-scanpackages.pl
scripts/po/de.po
scripts/po/sv.po
Diffstat (limited to 'scripts/Dpkg/Source/Package/V2.pm')
| -rw-r--r-- | scripts/Dpkg/Source/Package/V2.pm | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/scripts/Dpkg/Source/Package/V2.pm b/scripts/Dpkg/Source/Package/V2.pm index e1874cb2d..6757795c3 100644 --- a/scripts/Dpkg/Source/Package/V2.pm +++ b/scripts/Dpkg/Source/Package/V2.pm @@ -248,6 +248,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($_); |