test-dummy-drs `distro': for testing dgit-push-responder. WIP.

[dgit.git] / dgit

diff --git a/dgit b/dgit
index 0182b6f9e4fe7e1842154c2d636320b6bf1d5501..9936c5f943645d1956254535f0ebfd7da8f27442 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -469,6 +469,14 @@ our %defcfg = ('dgit.default.distro' => 'debian',
               'dgit-distro.test-dummy.archive-query' => "dummycat:$td/aq",
               'dgit-distro.test-dummy.mirror' => "file://$td/mirror/",
               'dgit-distro.test-dummy.upload-host' => 'test-dummy',
+              'dgit-distro.test-dummy-drs.ssh' => "$td/ssh",
+              'dgit-distro.test-dummy-drs.username' => "alice",
+              'dgit-distro.test-dummy-drs.git-check' => "true",
+              'dgit-distro.test-dummy-drs.git-create' => "true",
+              'dgit-distro.test-dummy-drs.git-url' => "$td/git",
+              'dgit-distro.test-dummy-drs.archive-query' => "dummycat:$td/aq",
+              'dgit-distro.test-dummy-drs.mirror' => "file://$td/mirror/",
+              'dgit-distro.test-dummy-drs.upload-host' => 'test-dummy',
                );
 
 sub cfg {
@@ -837,6 +845,8 @@ sub check_for_git () {
        my $r= cmdoutput @cmd;
        failedcmd @cmd unless $r =~ m/^[01]$/;
        return $r+0;
+    } elsif ($how eq 'true') {
+       return 1;
     } else {
        badcfg "unknown git-check \`$how'";
     }
@@ -849,6 +859,8 @@ sub create_remote_git_repo () {
            (access_cfg_ssh, access_gituserhost(),
             "set -e; cd ".access_cfg('git-path').";".
             " cp -a _template $package.git");
+    } elsif ($how eq 'true') {
+       # nothing to do
     } else {
        badcfg "unknown git-create \`$how'";
     }
@@ -1430,27 +1442,24 @@ sub dopush () {
     if (!check_for_git()) {
        create_remote_git_repo();
     }
-    runcmd_ordryrun @git, qw(push),access_giturl(),"HEAD:".rrref();
+    runcmd_ordryrun @git, qw(push),access_giturl(),
+        "HEAD:".rrref(), "refs/tags/$tag";
     runcmd_ordryrun @git, qw(update-ref -m), 'dgit push', lrref(), 'HEAD';
 
-    if (!$we_are_responder) {
-       if (act_local()) {
-           rename "$dscpath.tmp",$dscpath or die "$dscfn $!";
-       } else {
-           progress "[new .dsc left in $dscpath.tmp]";
-       }
-    }
-
     if ($we_are_responder) {
        my $dryrunsuffix = act_local() ? "" : ".tmp";
        responder_receive_files('signed-dsc-changes',
                                "$dscpath$dryrunsuffix",
                                "$changesfile$dryrunsuffix");
     } else {
+       if (act_local()) {
+           rename "$dscpath.tmp",$dscpath or die "$dscfn $!";
+       } else {
+           progress "[new .dsc left in $dscpath.tmp]";
+       }
        sign_changes $changesfile;
     }
 
-    runcmd_ordryrun @git, qw(push),access_giturl(),"refs/tags/$tag";
     my $host = access_cfg('upload-host','RETURN-UNDEF');
     my @hostarg = defined($host) ? ($host,) : ();
     runcmd_ordryrun @dput, @hostarg, $changesfile;