Bugfixes (now tests/tests/drs-clone-nogit works)

diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm
index e177a83950e0eb6fa8ee516f946fcb312fe00623..268439afaa44e5cdfdf4e9addb0dcf3c43a7ca87 100644 (file)
--- a/Debian/Dgit.pm
+++ b/Debian/Dgit.pm
@@ -16,8 +16,8 @@ BEGIN {
     @EXPORT      = qw(debiantag server_branch server_ref
                       stat_exists git_for_each_ref
                       $package_re $branchprefix);
     @EXPORT      = qw(debiantag server_branch server_ref
                       stat_exists git_for_each_ref
                       $package_re $branchprefix);

-    %EXPORT_TAGS = ( policyflags => [qw()] );
-    @EXPORT_OK   = qw();
+    %EXPORT_TAGS = ( policyflags => [qw(NOFFCHECK FRESHREPO)] );
+    @EXPORT_OK   = @{ $EXPORT_TAGS{policyflags} };

 }
 
 our @EXPORT_OK;
 }
 
 our @EXPORT_OK;

diff --git a/infra/dgit-repos-server b/infra/dgit-repos-server
index acff1727541491ace4bfc45ba4e56a63a7e40c84..f391b08776ada836a2720a7c6b429141178bdd85 100755 (executable)
--- a/infra/dgit-repos-server
+++ b/infra/dgit-repos-server
@@ -148,6 +148,7 @@ open DEBUG, ">/dev/null" or die $!;
 our $func;
 our $dgitrepos;
 our $package;
 our $func;
 our $dgitrepos;
 our $package;

+our $distro;

 our $suitesfile;
 our $policyhook;
 our $realdestrepo;
 our $suitesfile;
 our $policyhook;
 our $realdestrepo;


@@ -253,9 +254,9 @@ sub policyhook {
     my ($policyallowbits, @polargs) = @_;
     # => ($exitstatuspolicybitmap);
     die if $policyallowbits & ~0x3e;
     my ($policyallowbits, @polargs) = @_;
     # => ($exitstatuspolicybitmap);
     die if $policyallowbits & ~0x3e;

-    my @cmd = ($policyhook,$distro,$repos,@polargs);
-    debugcmd @_;
-    my $r = system @_;
+    my @cmd = ($policyhook,$distro,$dgitrepos,@polargs);
+    debugcmd @cmd;
+    my $r = system @cmd;

     die "system: $!" if $r < 0;
     die "hook (@cmd) failed ($?)" if $r & ~($policyallowbits << 8);
     return $r >> 8;
     die "system: $!" if $r < 0;
     die "hook (@cmd) failed ($?)" if $r & ~($policyallowbits << 8);
     return $r >> 8;


@@ -295,17 +296,6 @@ sub movetogarbage () {
        or die "$garbagerepo $!";
 }
 
        or die "$garbagerepo $!";
 }
 

-sub onwardpush () {
-    my @cmd = (qw(git send-pack), $destrepo);
-    push @cmd, qw(--force) if $policy & NOFFCHECK;
-    push @cmd, "$commit:refs/dgit/$suite",
-              "$tagval:refs/tags/$tagname");
-    debugcmd @cmd;
-    $!=0;
-    my $r = system @cmd;
-    !$r or die "onward push to $destrepo failed: $r $!";
-}
-

 #----- git-receive-pack -----
 
 sub fixmissing__git_receive_pack () {
 #----- git-receive-pack -----
 
 sub fixmissing__git_receive_pack () {


@@ -463,12 +453,14 @@ sub parsetag () {
     $version = $2;
     die "$3 != $suite " unless $3 eq $suite;
 
     $version = $2;
     die "$3 != $suite " unless $3 eq $suite;
 

+    my $copyl = $_;

     for (;;) {
     for (;;) {

-       print PT or die $!;
+       print PT $copyl or die $!;

        $!=0; $_=<T>; defined or die "missing signature? $!";
        $!=0; $_=<T>; defined or die "missing signature? $!";

+       $copyl = $_;

        if (m/^\[dgit ([^"].*)\]$/) { # [dgit "something"] is for future
            $_ = $1." ";
        if (m/^\[dgit ([^"].*)\]$/) { # [dgit "something"] is for future
            $_ = $1." ";

-           for (;;) {
+           while (length) {

                if (s/^distro\=(\S+) //) {
                    die "$1 != $distro" unless $1 eq $distro;
                } elsif (s/^(--deliberately-$package_re) //) {
                if (s/^distro\=(\S+) //) {
                    die "$1 != $distro" unless $1 eq $distro;
                } elsif (s/^(--deliberately-$package_re) //) {


@@ -478,13 +470,14 @@ sub parsetag () {
                    $supersedes{$1} = $2;
                } elsif (s/^[-+.=0-9a-z]\S* //) {
                } else {
                    $supersedes{$1} = $2;
                } elsif (s/^[-+.=0-9a-z]\S* //) {
                } else {

-                   die "unknown dgit info in tag";
+                   die "unknown dgit info in tag ($_)";

                }
            }
            next;
        }
        last if m/^-----BEGIN PGP/;
     }
                }
            }
            next;
        }
        last if m/^-----BEGIN PGP/;
     }

+    $_ = $copyl;

     for (;;) {
        print DS or die $!;
        $!=0; $_=<T>;
     for (;;) {
        print DS or die $!;
        $!=0; $_=<T>;


@@ -650,7 +643,7 @@ sub checktagnoreplay () {
 
     my @problems;
 
 
     my @problems;
 

-    git_for_each_tag_referring($objreferring, sub {
+    git_for_each_tag_referring($onlyreferring, sub {

        my ($objid,$fullrefname,$tagname) = @_;
        debug "checktagnoreplay - overwriting $fullrefname=$objid";
        my $supers = $supersedes{$fullrefname};
        my ($objid,$fullrefname,$tagname) = @_;
        debug "checktagnoreplay - overwriting $fullrefname=$objid";
        my $supers = $supersedes{$fullrefname};


@@ -697,7 +690,7 @@ sub checks () {
     lockrealtree();
 
     my @policy_args = ($package,$version,$suite,$tagname,
     lockrealtree();
 
     my @policy_args = ($package,$version,$suite,$tagname,

-                      join(",",@delberatelies));
+                      join(",",@deliberatelies));

     $policy = policyhook(NOFFCHECK|FRESHREPO, 'push', @policy_args);
 
     checktagnoreplay();
     $policy = policyhook(NOFFCHECK|FRESHREPO, 'push', @policy_args);
 
     checktagnoreplay();


@@ -731,6 +724,17 @@ sub checks () {
     policyhook(0, 'push-confirm', @policy_args);
 }
 
     policyhook(0, 'push-confirm', @policy_args);
 }
 

+sub onwardpush () {
+    my @cmd = (qw(git send-pack), $destrepo);
+    push @cmd, qw(--force) if $policy & NOFFCHECK;
+    push @cmd, "$commit:refs/dgit/$suite",
+              "$tagval:refs/tags/$tagname";
+    debugcmd @cmd;
+    $!=0;
+    my $r = system @cmd;
+    !$r or die "onward push to $destrepo failed: $r $!";
+}
+

 sub stunthook () {
     debug "stunthook";
     chdir $workrepo or die "chdir $workrepo: $!";
 sub stunthook () {
     debug "stunthook";
     chdir $workrepo or die "chdir $workrepo: $!";


@@ -805,7 +809,7 @@ sub parseargsdispatch () {
        exit 0;
     }
 
        exit 0;
     }
 

-    $ENV{'DGIT_DRS_DISTRO'} = argval();
+    $ENV{'DGIT_DRS_DISTRO'} = $distro = argval();

     $ENV{'DGIT_DRS_SUITES'} = argval();
     $ENV{'DGIT_DRS_KEYRINGS'} = argval();
     $dgitrepos = argval();
     $ENV{'DGIT_DRS_SUITES'} = argval();
     $ENV{'DGIT_DRS_KEYRINGS'} = argval();
     $dgitrepos = argval();

diff --git a/tests/drs-git-ext b/tests/drs-git-ext
index 52e781777ae5578b457c9c08cb2cf2c12ceb141e..73dcfa2ec01b05bb24a8af644e881deaf14ad7b1 100755 (executable)
--- a/tests/drs-git-ext
+++ b/tests/drs-git-ext
@@ -2,12 +2,14 @@
 set -e
 tmp=$DGIT_TEST_TMP
 
 set -e
 tmp=$DGIT_TEST_TMP
 

+export DGIT_DRS_DEBUG=1

 echo >&2 '(((((((((((((((((((((((((((((((((((((((('
 set -x
 export SSH_ORIGINAL_COMMAND="$*"
 echo >&2 '(((((((((((((((((((((((((((((((((((((((('
 set -x
 export SSH_ORIGINAL_COMMAND="$*"

-${DGIT_REPOS_SERVER_TEST-dgit-repos-server} \
+${DGIT_REPOS_SERVER_TEST-dgit-repos-server} test-dummy \

        $tmp/suites \
        $tmp/dd.gpg,a:$tmp/dm.gpg,m$tmp/dm.txt \
        $tmp/git \
        $tmp/suites \
        $tmp/dd.gpg,a:$tmp/dm.gpg,m$tmp/dm.txt \
        $tmp/git \

+       $tmp/policy \

        --ssh
 : '))))))))))))))))))))))))))))))))))))))))'
        --ssh
 : '))))))))))))))))))))))))))))))))))))))))'

diff --git a/tests/lib b/tests/lib
index adbd79ff587870bcd39e5443fd5e7f42f49258dc..6aab1522c08257ff1891987f82eeeccf526e548c 100644 (file)
--- a/tests/lib
+++ b/tests/lib
@@ -261,6 +261,7 @@ t-drs () {
  t-git-config dgit-distro.test-dummy.git-create true
        cp $root/tests/gnupg/{dd.gpg,dm.gpg,dm.txt} $tmp/.
        cp $root/tests/suites $tmp/.
  t-git-config dgit-distro.test-dummy.git-create true
        cp $root/tests/gnupg/{dd.gpg,dm.gpg,dm.txt} $tmp/.
        cp $root/tests/suites $tmp/.

+       ln -s /bin/true $tmp/policy

 }
 
 t-dss () {
 }
 
 t-dss () {