X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Debian%2FDgit.pm;h=5c43f0257b82860f0e6cff3e7d85040c144cd8df;hb=230275261f3bdec17bcd08c7005e4065355b0277;hp=863d1ad4fec52651f2585a5494630626ff58a885;hpb=79efde94a4372533a4cc1d1a48634eecdeef41e1;p=dgit.git

diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm
index 863d1ad4..5c43f025 100644
--- a/Debian/Dgit.pm
+++ b/Debian/Dgit.pm
@@ -1,4 +1,21 @@
 # -*- perl -*-
+# dgit
+# Debian::Dgit: functions common to dgit and its helpers and servers
+#
+# Copyright (C) 2015-2016  Ian Jackson
+#
+#    This program is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 package Debian::Dgit;
 
@@ -19,7 +36,8 @@ BEGIN {
     $VERSION     = 1.00;
     @ISA         = qw(Exporter);
     @EXPORT      = qw(setup_sigwarn
-                      debiantag_old debiantag_new server_branch server_ref
+                      debiantags debiantag_old debiantag_new
+		      server_branch server_ref
                       stat_exists link_ltarget
 		      hashfile
                       fail ensuredir executable_on_path
@@ -137,6 +155,11 @@ sub debiantag_new ($$) {
     return "archive/$distro/$v";
 }
 
+sub debiantags ($$) {
+    my ($version,$distro) = @_;
+    map { $_->($version, $distro) } (\&debiantag_new, \&debiantag_old);
+}
+
 sub server_branch ($) { return "$branchprefix/$_[0]"; }
 sub server_ref ($) { return "refs/".server_branch($_[0]); }
 
@@ -153,6 +176,7 @@ sub _us () {
 
 sub fail { 
     my $s = "@_\n";
+    $s =~ s/\n\n$/\n/;
     my $prefix = _us().": ";
     $s =~ s/^/$prefix/gm;
     die $s;