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

diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm
index 6932d14a7d07f32ae57a8ef4005643c4be1ea903..e177a83950e0eb6fa8ee516f946fcb312fe00623 100644 (file)
--- a/Debian/Dgit.pm
+++ b/Debian/Dgit.pm
@@ -1,10 +1,12 @@
-#
+# -*- perl -*-

 
 package Debian::Dgit;
 
 use strict;
 use warnings;
 
 
 package Debian::Dgit;
 
 use strict;
 use warnings;
 

+use POSIX;
+

 BEGIN {
     use Exporter   ();
     our ($VERSION, @ISA, @EXPORT, @EXPORT_OK, %EXPORT_TAGS);
 BEGIN {
     use Exporter   ();
     our ($VERSION, @ISA, @EXPORT, @EXPORT_OK, %EXPORT_TAGS);


@@ -14,7 +16,7 @@ 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_TAGS = ( policyflags => [qw()] );

     @EXPORT_OK   = qw();
 }
 
     @EXPORT_OK   = qw();
 }
 


@@ -51,7 +53,7 @@ sub git_for_each_ref ($$) {
     # calls $func->($objid,$objtype,$fullrefname,$reftail);
     # $reftail is RHS of ref after refs/\w+/
     # breaks if $pattern matches any ref `refs/blah' where blah has no `/'
     # calls $func->($objid,$objtype,$fullrefname,$reftail);
     # $reftail is RHS of ref after refs/\w+/
     # breaks if $pattern matches any ref `refs/blah' where blah has no `/'

-    my $fh = new IO::File, "-|", qw(git for-each-ref), $pattern or die $!;
+    my $fh = new IO::File "-|", qw(git for-each-ref), $pattern or die $!;

     while (<$fh>) {
        m#^(\w+)\s+(\w+)\s+(refs/\w+/(\S+))\s# or die "$_ ?";
        $func->($1,$2,$3,$4);
     while (<$fh>) {
        m#^(\w+)\s+(\w+)\s+(refs/\w+/(\S+))\s# or die "$_ ?";
        $func->($1,$2,$3,$4);

diff --git a/dgit b/dgit
index 9d40ceef5db54a2ae53c2b32ae4c5c0bd2a5110f..088c5a23385018e093bf35db792c1f4a0fffef97 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -52,6 +52,7 @@ our $new_package = 0;
 our $ignoredirty = 0;
 our $rmonerror = 1;
 our @deliberatelies;
 our $ignoredirty = 0;
 our $rmonerror = 1;
 our @deliberatelies;

+our %supersedes;

 our $existing_package = 'dpkg';
 our $cleanmode = 'dpkg-source';
 our $changes_since_version;
 our $existing_package = 'dpkg';
 our $cleanmode = 'dpkg-source';
 our $changes_since_version;


@@ -1562,6 +1563,7 @@ sub push_mktag ($$$$$$$) {
     # to control the "tagger" (b) we can do remote signing
     my $authline = clogp_authline $clogp;
     my $delibs = join(" ", "",@deliberatelies);
     # to control the "tagger" (b) we can do remote signing
     my $authline = clogp_authline $clogp;
     my $delibs = join(" ", "",@deliberatelies);

+    my $declaredistro = access_basedistro();

     open TO, '>', $tfn->('.tmp') or die $!;
     print TO <<END or die $!;
 object $head
     open TO, '>', $tfn->('.tmp') or die $!;
     print TO <<END or die $!;
 object $head


@@ -1570,7 +1572,7 @@ tag $tag
 tagger $authline
 
 $package release $cversion for $clogsuite ($csuite) [dgit]
 tagger $authline
 
 $package release $cversion for $clogsuite ($csuite) [dgit]

-[dgit distro=$distro$delibs]
+[dgit distro=$declaredistro$delibs]

 END
     foreach my $ref (sort keys %supersedes) {
                    print TO <<END or die $!;
 END
     foreach my $ref (sort keys %supersedes) {
                    print TO <<END or die $!;