From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 25 Oct 2013 16:00:14 +0000 (+0100)
Subject: break out pool_dsc_subpath
X-Git-Tag: debian/0.17_experimental4~6
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=5da0beaa99ee13adfd3378671ee0116975250c25;p=dgit.git

break out pool_dsc_subpath
---

diff --git a/dgit b/dgit
index d74dd85b..e5dbabba 100755
--- a/dgit
+++ b/dgit
@@ -585,6 +585,12 @@ sub archive_query ($) {
     { no strict qw(refs); &{"${method}_${proto}"}($proto,$data); }
 }
 
+sub pool_dsc_subpath ($$) {
+    my ($vsn,$component) = @_; # $package is implict arg
+    my $prefix = substr($package, 0, $package =~ m/^l/ ? 4 : 1);
+    return "/pool/$component/$prefix/$package/".dscfn($vsn);
+}
+
 sub archive_query_madison ($$) {
     my ($proto,$data) = @_;
     die unless $proto eq 'madison';
@@ -634,9 +640,7 @@ sub madison_parse ($) {
 	    $component = access_cfg('archive-query-default-component');
 	}
 	$5 eq 'source' or die "$rmad ?";
-	my $prefix = substr($package, 0, $package =~ m/^l/ ? 4 : 1);
-	my $subpath = "/pool/$component/$prefix/$package/".dscfn($vsn);
-	push @out, [$vsn,$subpath,$newsuite];
+	push @out, [$vsn,pool_dsc_subpath($vsn,$component),$newsuite];
     }
     return sort { -version_compare_string($a->[0],$b->[0]); } @out;
 }