X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit;h=ac394f0648a2adb5c2e8aa1bb1a45fead3996656;hb=0e6a55238ffdee98d5b23c70fe4105c41ea28f34;hp=8f4a71c2a3683087b020520dcc05fea6eb8a1fe5;hpb=6b9192c43040de5e0c18d0cd4057dcfb7457d86a;p=dgit.git

diff --git a/dgit b/dgit
index 8f4a71c2..ac394f06 100755
--- a/dgit
+++ b/dgit
@@ -444,12 +444,15 @@ our %defcfg = ('dgit.default.distro' => 'debian',
 	       'dgit.default.archive-query' => 'madison:',
 	       'dgit.default.sshpsql-dbname' => 'service=projectb',
 	       'dgit-distro.debian.archive-query' => 'ftpmasterapi:',
-	       'dgit-distro.debian.git-host' => 'dgit-git.debian.net',
-	       'dgit-distro.debian.git-user-force' => 'dgit',
-	       'dgit-distro.debian.git-proto' => 'git+ssh://',
-	       'dgit-distro.debian.git-path' => '/dgit/debian/repos',
-	       'dgit-distro.debian.git-create' => 'true',
-	       'dgit-distro.debian.git-check' => 'ssh-cmd',
+	       'dgit-distro.debian.git-check' => 'url',
+	       'dgit-distro.debian.git-check-suffix' => '/info/refs',
+	       'dgit-distro.debian/push.git-url' => '',
+	       'dgit-distro.debian/push.git-host' => 'dgit-git.debian.net',
+	       'dgit-distro.debian/push.git-user-force' => 'dgit',
+	       'dgit-distro.debian/push.git-proto' => 'git+ssh://',
+	       'dgit-distro.debian/push.git-path' => '/dgit/debian/repos',
+	       'dgit-distro.debian/push.git-create' => 'true',
+	       'dgit-distro.debian/push.git-check' => 'ssh-cmd',
  'dgit-distro.debian.archive-query-url', 'https://api.ftp-master.debian.org/',
 # 'dgit-distro.debian.archive-query-tls-key',
 #    '/etc/ssl/certs/%HOST%.pem:/etc/dgit/%HOST%.pem',
@@ -461,6 +464,8 @@ our %defcfg = ('dgit.default.distro' => 'debian',
 #   '--ca-path=/etc/ssl/ca-debian',
 # ^ this is a workaround but works (only) on DSA-administered machines
 	       'dgit-distro.debian.diverts.alioth' => '/alioth',
+	       'dgit-distro.debian.git-url' => 'https://git.dgit.debian.org',
+	       'dgit-distro.debian.git-url-suffix' => '',
 	       'dgit-distro.debian/push.diverts.alioth' => '/alioth',
 	       'dgit-distro.debian/alioth.git-host' => 'git.debian.org',
 	       'dgit-distro.debian/alioth.git-user-force' => '',
@@ -1058,6 +1063,24 @@ sub check_for_git () {
 	}
 	failedcmd @cmd unless $r =~ m/^[01]$/;
 	return $r+0;
+    } elsif ($how eq 'url') {
+	my $prefix = access_cfg('git-check-url','git-url');
+	my $suffix = access_cfg('git-check-suffix','git-suffix',
+				'RETURN-UNDEF') // '.git';
+	my $url = "$prefix/$package$suffix";
+	my @cmd = (qw(curl -sS -I), $url);
+	my $result = cmdoutput @cmd;
+	$result =~ m/^\S+ (404|200) /s or
+	    fail "unexpected results from git check query - ".
+	        Dumper($prefix, $result);
+	my $code = $1;
+	if ($code eq '404') {
+	    return 0;
+	} elsif ($code eq '200') {
+	    return 1;
+	} else {
+	    die;
+	}
     } elsif ($how eq 'true') {
 	return 1;
     } elsif ($how eq 'false') {