chiark / gitweb /
Be able to clone or fetch from Debian backports suites (which are a bit like main...
[dgit.git] / dgit
diff --git a/dgit b/dgit
index bb1d217e962d238a23b5df5f8c51887708cf06dd..a5736e1c6946c6b8d082941f4ed689384956cd56 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -457,6 +457,8 @@ our %defcfg = ('dgit.default.distro' => 'debian',
               'dgit-distro.debian.sshpsql-dbname' => 'service=projectb',
               'dgit-distro.debian.upload-host' => 'ftp-master', # for dput
               'dgit-distro.debian.mirror' => 'http://ftp.debian.org/debian/',
+ 'dgit-distro.debian.backports-quirk' => '%-backports*',
+ 'dgit-distro.debian-backports.mirror' => 'http://backports.debian.org/debian-backports/',
               'dgit-distro.test-dummy.ssh' => "$td/ssh",
               'dgit-distro.test-dummy.username' => "alice",
               'dgit-distro.test-dummy.git-check' => "ssh-cmd",
@@ -497,6 +499,17 @@ sub access_basedistro () {
 sub access_quirk () {
     # returns (quirk name, distro to use instead, quirk-specific info)
     my $basedistro = access_basedistro();
+    my $backports_quirk = cfg("dgit-distro.$basedistro.backports-quirk",
+                             'RETURN-UNDEF');
+    if (defined $backports_quirk) {
+       my $re = $backports_quirk;
+       $re =~ s/[^-0-9a-z_\%*]/\\$&/ig;
+       $re =~ s/\*/.*/g;
+       $re =~ s/\%/([-0-9a-z_]+)/ or badcfg "backports-quirk needs \%";
+       if ($isuite =~ m/^$re$/) {
+           return ('backports',"$basedistro-backports",$1);
+       }
+    }
     return ('none',$basedistro);
 }
 
@@ -614,7 +627,7 @@ sub archive_query ($) {
     my ($method) = @_;
     my $query = access_cfg('archive-query','RETURN-UNDEF');
     if (!defined $query) {
-       my $distro = access_distro();
+       my $distro = access_basedistro();
        if ($distro eq 'debian') {
            $query = "sshpsql:".
                access_someuserhost('sshpsql').':'.