X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=Debian%2FDgit.pm;h=1bac97bde55d02a5cc00e0ba388348f7f8537012;hp=5c43f0257b82860f0e6cff3e7d85040c144cd8df;hb=f93eae496d1ab8aebe85d9080c4e372ebe9b3715;hpb=c7821c26c30b0a79658b626ee7f2a17f73cdc952

diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm
index 5c43f025..1bac97bd 100644
--- a/Debian/Dgit.pm
+++ b/Debian/Dgit.pm
@@ -36,12 +36,14 @@ BEGIN {
     $VERSION     = 1.00;
     @ISA         = qw(Exporter);
     @EXPORT      = qw(setup_sigwarn
+		      dep14_version_mangle
                       debiantags debiantag_old debiantag_new
 		      server_branch server_ref
                       stat_exists link_ltarget
 		      hashfile
                       fail ensuredir executable_on_path
-                      waitstatusmsg failedcmd
+                      waitstatusmsg failedcmd_waitstatus
+		      failedcmd_report_cmd failedcmd
                       cmdoutput cmdoutput_errok
                       git_rev_parse git_get_ref git_for_each_ref
                       git_for_each_tag_referring is_fast_fwd
@@ -143,16 +145,22 @@ sub debugcmd {
     printcmd(\*DEBUG,$debugprefix.$extraprefix,@_) if $debuglevel>0;
 }
 
+sub dep14_version_mangle ($) {
+    my ($v) = @_;
+    # DEP-14 patch proposed 2016-11-09  "Version Mangling"
+    $v =~ y/~:/_%/;
+    $v =~ s/\.(?=\.|$|lock$)/.#/g;
+    return $v;
+}
+
 sub debiantag_old ($$) { 
     my ($v,$distro) = @_;
-    $v =~ y/~:/_%/;
-    return "$distro/$v";
+    return "$distro/". dep14_version_mangle $v;
 }
 
 sub debiantag_new ($$) { 
     my ($v,$distro) = @_;
-    $v =~ y/~:/_%/;
-    return "archive/$distro/$v";
+    return "archive/$distro/".dep14_version_mangle $v;
 }
 
 sub debiantags ($$) {
@@ -217,6 +225,22 @@ sub waitstatusmsg () {
     }
 }
 
+sub failedcmd_report_cmd {
+    my $intro = shift @_;
+    $intro //= "failed command";
+    { local ($!); printcmd \*STDERR, _us().": $intro:", @_ or die $!; };
+}
+
+sub failedcmd_waitstatus {
+    if ($? < 0) {
+	return "failed to fork/exec: $!";
+    } elsif ($?) {
+	return "subprocess ".waitstatusmsg();
+    } else {
+	return "subprocess produced invalid output";
+    }
+}
+
 sub failedcmd {
     # Expects $!,$? as set by close - see below.
     # To use with system(), set $?=-1 first.
@@ -229,14 +253,8 @@ sub failedcmd {
     #   success              trashed     $?==0       system
     #   program failed       trashed     $? >0       system
     #   syscall failure      $! >0       unchanged   system
-    { local ($!); printcmd \*STDERR, _us().": failed command:", @_ or die $!; };
-    if ($? < 0) {
-	fail "failed to fork/exec: $!";
-    } elsif ($?) {
-	fail "subprocess ".waitstatusmsg();
-    } else {
-	fail "subprocess produced invalid output";
-    }
+    failedcmd_report_cmd undef, @_;
+    fail failedcmd_waitstatus();
 }
 
 sub cmdoutput_errok {